Since none of the code is written to handle it, never return a tuple from new_protect...

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

diff --git a/pym/portage_util.py b/pym/portage_util.py
index 54d221d8fcb232db980cdb2d287dc80748b8656e..c44360200006c764c214a32a1860a01d8f1866ac 100644 (file)
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -904,9 +904,4 @@ def new_protect_filename(mydest, newmd5=None):
                if portage_checksum.perform_md5(
                        os.path.join(real_dirname, last_pfile)) == newmd5:
                        return old_pfile
-               else:
-                       return new_pfile
-       elif newmd5:
-               return new_pfile
-       else:
-               return (new_pfile, old_pfile)
+       return new_pfile