From dcbccd1844a49c5b7439e54a83b8a5eefd863182 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Oct 2009 19:19:23 +0000 Subject: Discard the log on success, since otherwise we'll have multiple log files for the same package. svn path=/main/trunk/; revision=14559 --- pym/_emerge/BinpkgVerifier.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index 404becf09..d36958717 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -54,7 +54,15 @@ class BinpkgVerifier(AsynchronousTask): 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) -- cgit v1.2.3-1-g7c22