summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-12 21:39:01 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-12 21:39:01 +0000
commitcd97b021644b8cce55fa9b382605f60de276ff9b (patch)
tree64b735fe14f58aa39a787b6e631b1368ee372792
parent6dabd57faaa99230a581ed608b8ddde9d4d056b3 (diff)
downloadportage-cd97b021644b8cce55fa9b382605f60de276ff9b.tar.gz
portage-cd97b021644b8cce55fa9b382605f60de276ff9b.tar.bz2
portage-cd97b021644b8cce55fa9b382605f60de276ff9b.zip
Make BinpkgVerifier rename files that fail verification, similar to how
distfiles are automatically renamed. (trunk r12197) svn path=/main/branches/2.1.6/; revision=12230
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index deb92eeb5..3a5d82cec 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3505,6 +3505,12 @@ class BinpkgVerifier(AsynchronousTask):
writemsg("!!! Expected: %s\n" % e.value[3],
noiselevel=-1)
rval = 1
+ if rval != os.EX_OK:
+ pkg_path = bintree.getname(pkg.cpv)
+ head, tail = os.path.split(pkg_path)
+ temp_filename = portage._checksum_failure_temp_file(head, tail)
+ writemsg("File renamed to '%s'\n" % (temp_filename,),
+ noiselevel=-1)
finally:
sys.stdout = stdout_orig
sys.stderr = stderr_orig