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

line for all digests. (trunk r8385)

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

diff --git a/pym/portage.py b/pym/portage.py
index e27680ae96bd919fdca11021a2bd709d28e566bc..fbb42d8cf504ed0f85aef4ec3578f0ef5955f618 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3126,8 +3126,10 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                else:
                                                                        eout = 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