Make BinpkgVerifier rename files that fail verification, similar to how

distfiles are automatically renamed.

svn path=/main/trunk/; revision=12197

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4d864d6cade1f91bb9c58b17e92bbfd1a31083e3..44107ee2088cc75b05b807fc41d56138b24c17c9 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3524,6 +3524,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