In portage.fetch(), condense digest check output to a single
authorZac Medico <zmedico@gentoo.org>
Sat, 3 Nov 2007 01:54:33 +0000 (01:54 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 3 Nov 2007 01:54:33 +0000 (01:54 -0000)
line for all digests.

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

pym/portage/__init__.py

index 96d6d7cfe635c4882dbd46fe467358474c708f1a..d609d2b6ede1f0aaf97f42b203d84ea3e26f6893 100644 (file)
@@ -3171,8 +3171,10 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                else:
                                                                        eout = portage.output.EOutput()
                                                                        eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
-                                                                       for x_key in mydigests[myfile]:
-                                                                               eout.ebegin("%s %s ;-)" % (myfile, x_key))
+                                                                       digests = mydigests.get(myfile)
+                                                                       if digests:
+                                                                               eout.ebegin("%s %s ;-)" % \
+                                                                                       (myfile, " ".join(sorted(digests))))
                                                                                eout.eend(0)
                                                                        fetched=2
                                                                        break