From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 4 Sep 2006 17:59:09 +0000 (-0000)
Subject: Since none of the code is written to handle it, never return a tuple from new_protect... 
X-Git-Tag: v2.1.1~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c6f06a5737438aae4698deb604056b8c1e93aa5;p=portage.git

Since none of the code is written to handle it, never return a tuple from new_protect_filename().  See bug #146289.

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

diff --git a/pym/portage_util.py b/pym/portage_util.py
index 54d221d8f..c44360200 100644
--- 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