diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-10 19:20:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-10 19:20:16 +0000 |
| commit | 278981d337426529ad9a5ea1d8e0032f79410a6b (patch) | |
| tree | e0102608b7f85caa74b219be4b8106c0374b7a31 | |
| parent | Document 'backtracking' in the MASKED PACKAGES section. (trunk r14557) (diff) | |
| download | portage-multirepo-278981d337426529ad9a5ea1d8e0032f79410a6b.tar.gz portage-multirepo-278981d337426529ad9a5ea1d8e0032f79410a6b.tar.bz2 portage-multirepo-278981d337426529ad9a5ea1d8e0032f79410a6b.zip | |
Discard the log on success, since otherwise we'll have multiple log files for
the same package. (trunk r14559)
svn path=/main/branches/2.1.7/; revision=14560
| -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 404becf0..d3695871 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) |