In portage.fetch(), condense digest check ouput to a single
authorZac Medico <zmedico@gentoo.org>
Fri, 26 Oct 2007 19:35:01 +0000 (19:35 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 26 Oct 2007 19:35:01 +0000 (19:35 -0000)
line for all digests.

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

pym/portage/__init__.py

index 06878c61c74df6267541ca19ee2c05291c162a64..2295116da00c1c33b49fae5e5c502cd25d916eea 100644 (file)
@@ -2993,9 +2993,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                eout = portage.output.EOutput()
                                                                eout.quiet = \
                                                                        mysettings.get("PORTAGE_QUIET", None) == "1"
-                                                               for digest_name in mydigests[myfile]:
+                                                               digests = mydigests.get(myfile)
+                                                               if digests:
+                                                                       digests = digests.keys()
+                                                                       digests.sort()
                                                                        eout.ebegin(
-                                                                               "%s %s ;-)" % (myfile, digest_name))
+                                                                               "%s %s ;-)" % (myfile, " ".join(digests)))
                                                                        eout.eend(0)
                                                                continue # fetch any remaining files