* [gentoo-commits] portage r14560 - main/branches/2.1.7/pym/_emerge
@ 2009-10-10 19:20 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-10-10 19:20 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-10-10 19:20:16 +0000 (Sat, 10 Oct 2009)
New Revision: 14560
Modified:
main/branches/2.1.7/pym/_emerge/BinpkgVerifier.py
Log:
Discard the log on success, since otherwise we'll have multiple log files for
the same package. (trunk r14559)
Modified: main/branches/2.1.7/pym/_emerge/BinpkgVerifier.py
===================================================================
--- main/branches/2.1.7/pym/_emerge/BinpkgVerifier.py 2009-10-10 19:19:23 UTC (rev 14559)
+++ main/branches/2.1.7/pym/_emerge/BinpkgVerifier.py 2009-10-10 19:20:16 UTC (rev 14560)
@@ -54,7 +54,15 @@
writemsg("!!! Expected: %s\n" % e.value[3],
noiselevel=-1)
rval = 1
- if rval != os.EX_OK:
+ if rval == os.EX_OK:
+ # If this was successful, discard the log here since otherwise
+ # we'll get multiple logs for the same package.
+ if log_file is not None:
+ try:
+ os.unlink(self.logfile)
+ except OSError:
+ pass
+ else:
pkg_path = bintree.getname(pkg.cpv)
head, tail = os.path.split(pkg_path)
temp_filename = portage._checksum_failure_temp_file(head, tail)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-10 19:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-10 19:20 [gentoo-commits] portage r14560 - main/branches/2.1.7/pym/_emerge Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox