Changeset 785:7fa99e74e8ab

Timestamp:

06/16/16 17:43:30 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

version_0.37_maint

Phase:

public

Message:

Made the update procedure more resilient to errors

File:

• src/mlx/update.py (modified) (5 diffs)

src/mlx/update.py

@@ -10 +10 @@
 import subprocess
 import hashlib
+import traceback
 
 if os.name=="nt":
@@ -291 +292 @@
             sum.update(path)
             toremoveDir = getToremoveDir(toremoveDir, directory)
-            os.rename(path, os.path.join(toremoveDir, sum.hexdigest()))
+            targetPath = os.path.join(toremoveDir, sum.hexdigest())
+            try:
+                os.remove(targetPath)
+            except:
+                pass
+            os.rename(path, targetPath)
         except Exception, e:
             print "Cannot remove file " + path + ": " + utf2unicode(str(e))
@@ -372 +378 @@
         listener.done()
     except Exception, e:
+        exc = traceback.format_exc()
+        print >> sys.stderr, utf2unicode(exc)
+        
         error = utf2unicode(str(e))
         print >> sys.stderr, "Error:", error
+
         listener.failed(error)
 
@@ -521 +531 @@
 def update(directory, updateURL, listener, fromGUI = False):
     """Perform the update."""
-    result = prepareUpdate(directory, updateURL, listener)
-    if result is None:
-        return
-
-    (manifest, updateManifest, modifiedAndNew, removed) = result        
-    localRemoved = getToremoveFiles(directory)
-
-    if not modifiedAndNew and not removed and not localRemoved:
-        listener.done()
-        return
-
-    if fromGUI and not isDirectoryWritable(directory):
-        if listener.needSudo():
-            sudoUpdate(directory, updateURL, listener, updateManifest)
-    else:
-        updateFiles(directory, updateURL, listener, updateManifest,
-                    modifiedAndNew, removed, localRemoved)
+    try:
+        result = prepareUpdate(directory, updateURL, listener)
+        if result is None:
+            return
+
+        (manifest, updateManifest, modifiedAndNew, removed) = result        
+        localRemoved = getToremoveFiles(directory)
+
+        if not modifiedAndNew and not removed and not localRemoved:
+            listener.done()
+            return
+
+        if fromGUI and not isDirectoryWritable(directory):
+            if listener.needSudo():
+                sudoUpdate(directory, updateURL, listener, updateManifest)
+        else:
+            updateFiles(directory, updateURL, listener, updateManifest,
+                        modifiedAndNew, removed, localRemoved)
+    except Exception, e:
+        exc = traceback.format_exc()
+        print >> sys.stderr, utf2unicode(exc)
+        
+        error = utf2unicode(str(e))
+        print >> sys.stderr, "Update error:", error
+        
+        listener.failed(error)
 
 #------------------------------------------------------------------------------
@@ -543 +562 @@
 def updateProcess():
     """This is called in the child process, when we need a child process."""
-    clientSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)    
-    clientSocket.connect(("127.0.0.1", int(sys.argv[1])))
-
-    directory = os.path.dirname(sys.argv[0])
-
-    manifest = readLocalManifest(directory)
-    
-    updateManifest = Manifest()
-    with open(sys.argv[2], "rt") as f:
-        updateManifest.readFrom(f)
-
-    (modifiedAndNew, removed) = manifest.compare(updateManifest)
-    localRemoved = getToremoveFiles(directory)
-
-    updateFiles(directory, sys.argv[3],
-                ClientListener(clientSocket),
-                updateManifest, modifiedAndNew, removed, localRemoved)
+    try:
+        clientSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)    
+        clientSocket.connect(("127.0.0.1", int(sys.argv[1])))
+
+        directory = os.path.dirname(sys.argv[0])
+
+        manifest = readLocalManifest(directory)
+
+        updateManifest = Manifest()
+        with open(sys.argv[2], "rt") as f:
+            updateManifest.readFrom(f)
+
+        (modifiedAndNew, removed) = manifest.compare(updateManifest)
+        localRemoved = getToremoveFiles(directory)
+
+        updateFiles(directory, sys.argv[3],
+                    ClientListener(clientSocket),
+                    updateManifest, modifiedAndNew, removed, localRemoved)
+    except:
+        exc = traceback.format_exc()
+        print >> sys.stderr, utf2unicode(exc)
 
 #------------------------------------------------------------------------------