Changeset 39:9d04ac37db89

Timestamp:

03/08/12 15:41:55 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Running mlxupdate.exe via ShellExecute in Windows, so that the UAC dialog pops up properly

Files:

• MLXMANIFEST (modified) (1 diff)
• src/mlx/update.py (modified) (4 diffs)

MLXMANIFEST

@@ -1 @@
-update1.txt     6       09f7e02f1290be211da707a266f153b3
 runmlx.exe      64000   48360723d8abcd080cddcfb690daef60
+newdir/update2.txt      29      42f4b2fbb107747f2aff8969bfe5b648

src/mlx/update.py

@@ -12 +12 @@
 import subprocess
 import hashlib
+
+if os.name=="nt":
+    import win32api
 
 #------------------------------------------------------------------------------
@@ -426 +429 @@
         serverSocket.listen(1)
 
-        process = subprocess.Popen([os.path.join(directory, "mlxupdate"),
-                                    str(port), manifestFile],
-                                   shell = os.name=="nt")
+
+        if os.name=="nt":
+            win32api.ShellExecute(0, "open", os.path.join(directory, "mlxupdate"),
+                                  str(port) + " " +  manifestFile, "", 1)
+        else:
+            process = subprocess.Popen([os.path.join(directory, "mlxupdate"),
+                                        str(port), manifestFile],
+                                       shell = os.name=="nt")
 
         (mlxUpdateSocket, _) = serverSocket.accept()
@@ -446 +454 @@
         mlxUpdateSocket = None
 
-        process.wait()
+        if os.name!="nt":
+            process.wait()
+        
     except Exception, e:
         print >> sys.stderr, "Failed updating:", str(e)
@@ -490 +500 @@
     if fromGUI and not isDirectoryWritable(directory):
         if listener.needSudo():
-            sudoUpdate(directory, updateURL, listener,
-                       updateManifest)
+            sudoUpdate(directory, updateURL, listener, updateManifest)
     else:
         updateFiles(directory, updateURL, listener, updateManifest,