In portage.fetch(), condense digest check output to a single

line for all digests. (trunk r8316)

svn path=/main/branches/2.1.2/; revision=8370

diff --git a/pym/portage.py b/pym/portage.py
index a2d8ce26d3baa4fcb5c1c4d5f3f3c0120a71dc85..3bc20c0615af3e4ba4f31861142294f0282ee2af 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2948,9 +2948,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                eout = 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