From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66C0F1381F3 for ; Sat, 24 Aug 2013 16:17:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74F96E0AD8; Sat, 24 Aug 2013 16:17:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D3A7E0AD8 for ; Sat, 24 Aug 2013 16:17:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C604D33ECE6 for ; Sat, 24 Aug 2013 16:17:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5D6D7E468F for ; Sat, 24 Aug 2013 16:17:37 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1377361031.a9e79995f6ee561d543ed517e826966f9c3cf7df.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a9e79995f6ee561d543ed517e826966f9c3cf7df X-VCS-Branch: master Date: Sat, 24 Aug 2013 16:17:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 69d897da-c063-49d3-90d2-539d38bb0da2 X-Archives-Hash: 7896bbc5543176016b92cbd0bf58a981 commit: a9e79995f6ee561d543ed517e826966f9c3cf7df Author: Zac Medico gentoo org> AuthorDate: Sat Aug 24 16:17:11 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 24 16:17:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a9e79995 emerge --sync: discard timestamp after SIGINT --- pym/_emerge/actions.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index bb6e496..47a9703 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