From 59353b3dee6cde749244f6596a36032e50639c88 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Jun 2006 02:31:46 +0000 Subject: Save timestamp.chk even when metadata-transfer is disabled for bug #137177. This patch is from trunk r3537. svn path=/main/branches/2.1/; revision=3567 --- bin/emerge | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 3172fad5b..86ded28d9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2881,6 +2881,18 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts): if (exitcode==0): emergelog("=== Sync completed with %s" % dosyncuri) + # save timestamp.chk for next timestamp check. + try: + if tmpservertimestampfile is not None: + portage.movefile(tmpservertimestampfile, + servertimestampfile) + except SystemExit, e: + raise + except Exception, e: + portage.writemsg("!!! Failed to save current timestamp.\n", + noiselevel=-1) + portage.writemsg("!!! %s\n" % str(e), noiselevel=-1) + del e elif (exitcode>0): print if exitcode==1: @@ -2953,16 +2965,6 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts): #if os.path.exists(cachedir+"/"+myportdir): # portage.spawn("rm -Rf "+cachedir+"/"+myportdir+"/*",portage.settings,free=1) - # save timestamp.chk for next timestamp check. - try: - if tmpservertimestampfile != None: - portage.movefile(tmpservertimestampfile, servertimestampfile) - except SystemExit, e: - raise # Needed else can't exit - except Exception, e: - print "!!! Failed to save current timestamp." - print "!!!",e - portage.portdb.flush_cache() ec = portage.eclass_cache.cache(portage.portdb.porttree_root) -- cgit v1.2.3-1-g7c22