emerge --sync: discard timestamp after SIGINT
authorZac Medico <zmedico@gentoo.org>
Sat, 24 Aug 2013 16:17:11 +0000 (09:17 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 24 Aug 2013 16:17:11 +0000 (09:17 -0700)
pym/_emerge/actions.py

index bb6e4969072b9f5f4c05957537d2400bcf771f39..47a9703fe3209472f70f9ee2abb21298083621ae 100644 (file)
@@ -2542,21 +2542,22 @@ def _sync_repo(emerge_config, repo):
                                                        # interrupted
                                                        exitcode = 128 + signal.SIGINT
 
-                                       #   0   Success
-                                       #   1   Syntax or usage error
-                                       #   2   Protocol incompatibility
-                                       #   5   Error starting client-server protocol
-                                       #  35   Timeout waiting for daemon connection
-                                       if exitcode not in (0, 1, 2, 5, 35):
-                                               # If the exit code is not among those listed above,
-                                               # then we may have a partial/inconsistent sync state,
-                                               # so our previously read timestamp as well as the
-                                               # corresponding file can no longer be trusted.
-                                               mytimestamp = 0
-                                               try:
-                                                       os.unlink(servertimestampfile)
-                                               except OSError:
-                                                       pass
+                                               #   0   Success
+                                               #   1   Syntax or usage error
+                                               #   2   Protocol incompatibility
+                                               #   5   Error starting client-server protocol
+                                               #  35   Timeout waiting for daemon connection
+                                               if exitcode not in (0, 1, 2, 5, 35):
+                                                       # If the exit code is not among those listed above,
+                                                       # then we may have a partial/inconsistent sync
+                                                       # state, so our previously read timestamp as well
+                                                       # as the corresponding file can no longer be
+                                                       # trusted.
+                                                       mytimestamp = 0
+                                                       try:
+                                                               os.unlink(servertimestampfile)
+                                                       except OSError:
+                                                               pass
 
                                        if exitcode in [0,1,3,4,11,14,20,21]:
                                                break