Bug #209768 - Fix --search "Size of files:" handling so that it properly

shows the "Unknown (missing digest)" message instead of a traceback.
(trunk r9333)

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

diff --git a/bin/emerge b/bin/emerge
index 2863b10d055300d42c049fc19ab5cfb1e28cf803..bef6f40610caf5005447139f69aca4f0e6bf8305 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -624,6 +624,7 @@ class search:
                                        myversion = self.getVersion(full_package, search.VERSION_RELEASE)
 
                                        mysum = [0,0]
+                                       file_size_str = None
                                        mycat = match.split("/")[0]
                                        mypkg = match.split("/")[1]
                                        mycpv = match + "-" + myversion
@@ -638,7 +639,7 @@ class search:
                                                try:
                                                        mysum[0] = mf.getDistfilesSize(fetchlist)
                                                except KeyError, e:
-                                                       mysum[0] = "Unknown (missing digest for %s)" % \
+                                                       file_size_str = "Unknown (missing digest for %s)" % \
                                                                str(e)
 
                                        available = False
@@ -654,13 +655,13 @@ class search:
                                                                        myebuild = None
                                                        break
 
-                                       if myebuild:
+                                       if myebuild and file_size_str is None:
                                                mystr = str(mysum[0] / 1024)
                                                mycount = len(mystr)
                                                while (mycount > 3):
                                                        mycount -= 3
                                                        mystr = mystr[:mycount] + "," + mystr[mycount:]
-                                               mysum[0] = mystr + " kB"
+                                               file_size_str = mystr + " kB"
 
                                        if self.verbose:
                                                if available:
@@ -668,7 +669,7 @@ class search:
                                                print "     ", self.getInstallationStatus(mycat+'/'+mypkg)
                                                if myebuild:
                                                        print "      %s %s" % \
-                                                               (darkgreen("Size of files:"), mysum[0])
+                                                               (darkgreen("Size of files:"), file_size_str)
                                                print "     ", darkgreen("Homepage:")+"     ",homepage
                                                print "     ", darkgreen("Description:")+"  ",desc
                                                print "     ", darkgreen("License:")+"      ",license