fetch: fix listonly/allow_missing_digests logic
authorZac Medico <zmedico@gentoo.org>
Tue, 28 Dec 2010 21:58:16 +0000 (13:58 -0800)
committerZac Medico <zmedico@gentoo.org>
Tue, 28 Dec 2010 22:01:36 +0000 (14:01 -0800)
pym/portage/package/ebuild/fetch.py

index 3e6326a49485e80cef25a91d5aa2134971cb5fd1..7d61e900bd3509d4a3290a22835658e8972d1835 100644 (file)
@@ -532,7 +532,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 
                orig_digests = mydigests.get(myfile, {})
 
-               if not allow_missing_digests:
+               if not (allow_missing_digests or listonly):
                        verifiable_hash_types = set(orig_digests).intersection(hashfunc_map)
                        verifiable_hash_types.discard("size")
                        if not verifiable_hash_types:
@@ -551,9 +551,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
                                writemsg(_("!!! Got:      %s\n!!! Expected: %s\n") % \
                                        (reason[1], reason[2]), noiselevel=-1)
 
-                               if listonly:
-                                       continue
-                               elif fetchonly:
+                               if fetchonly:
                                        failed_files.add(myfile)
                                        continue
                                else: