diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-04 17:59:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-04 17:59:09 +0000 |
| commit | 3c6f06a5737438aae4698deb604056b8c1e93aa5 (patch) | |
| tree | 52ff7256ef43c82fde5d04c39edf2a25f228b10b | |
| parent | c7aae28b0d90a03b78ea11f2cf22e1f909875bb5 (diff) | |
| download | portage-3c6f06a5737438aae4698deb604056b8c1e93aa5.tar.gz portage-3c6f06a5737438aae4698deb604056b8c1e93aa5.tar.bz2 portage-3c6f06a5737438aae4698deb604056b8c1e93aa5.zip | |
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
| -rw-r--r-- | pym/portage_util.py | 7 |
1 files changed, 1 insertions, 6 deletions
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 |