From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Aug 2013 16:17:11 +0000 (-0700)
Subject: emerge --sync: discard timestamp after SIGINT
X-Git-Tag: v2.2.2~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9e79995f6ee561d543ed517e826966f9c3cf7df;p=portage.git

emerge --sync: discard timestamp after SIGINT
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index bb6e49690..47a9703fe 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -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