diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-10 19:19:23 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-10 19:19:23 +0000 |
commit | dcbccd1844a49c5b7439e54a83b8a5eefd863182 (patch) | |
tree | 28171034ab42d9ddc50d2110771495992ca4a05d | |
parent | 2d36407412c2e22a23a29e8d930fc30b951c8fde (diff) | |
download | portage-dcbccd1844a49c5b7439e54a83b8a5eefd863182.tar.gz portage-dcbccd1844a49c5b7439e54a83b8a5eefd863182.tar.bz2 portage-dcbccd1844a49c5b7439e54a83b8a5eefd863182.zip |
Discard the log on success, since otherwise we'll have multiple log files for
the same package.
svn path=/main/trunk/; revision=14559
-rw-r--r-- | pym/_emerge/BinpkgVerifier.py | 10 |
1 files changed, 9 insertions, 1 deletions
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) |