[yum-git] 2 commits - plugins/list-data

James Antill james at linux.duke.edu
Thu Jan 31 19:08:41 UTC 2008


 plugins/list-data/list-data.py |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 2637bff4604562822821a94b088b754e17853375
Author: James Antill <james at and.org>
Date:   Thu Jan 31 14:02:22 2008 -0500

    Keep the .strip() result for all strings

diff --git a/plugins/list-data/list-data.py b/plugins/list-data/list-data.py
index 3e4f8b4..52b88c1 100755
--- a/plugins/list-data/list-data.py
+++ b/plugins/list-data/list-data.py
@@ -94,7 +94,7 @@ Display aggregate data on the %s attribute of a group of packages""" % self.attr
             self.show_pkgs(msg, calc[data])
 
     # pkg.vendor has weird values, for instance
-    def get_data(self, data):
+    def get_data(self, data, strip=True):
         if not hasattr(data, self.attr):
             return self.unknown
         
@@ -107,7 +107,10 @@ Display aggregate data on the %s attribute of a group of packages""" % self.attr
         tval = str(val).strip()
         if tval == "":
             return self.unknown
-        
+
+        if strip:
+            return tval
+
         return val
             
     def doCommand(self, base, basecmd, extcmds):
@@ -164,7 +167,7 @@ class SizeRangeData:
         return hash(self._msg)
 
 def size_get_data(self, data):
-    val = self.oget_data(data)
+    val = self.oget_data(data, strip=False)
     if val == self.unknown:
         return val
 
commit cf8a14fbdde6ace4f7091c00474b75cec4921736
Author: James Antill <james at and.org>
Date:   Thu Jan 31 14:00:15 2008 -0500

    Add special case for "zero length" sizes

diff --git a/plugins/list-data/list-data.py b/plugins/list-data/list-data.py
index 55eab79..3e4f8b4 100755
--- a/plugins/list-data/list-data.py
+++ b/plugins/list-data/list-data.py
@@ -185,7 +185,12 @@ def size_get_data(self, data):
             (100 * 1024 * 1024, "100MB"),
             (500 * 1024 * 1024, "500MB"),
             )
-    pnum = (0, "  0KB")
+    pnum = (0, "   0B")
+    if val <= pnum[0]:
+        msg = "[ %s - %s ]  " % (" " * len(pnum[1]), pnum[1])
+        return SizeRangeData(pnum[0], msg)
+
+    pnum = (1, "   1B")
     for num in nums:
         if val >= pnum[0] and val <= num[0]:
             msg = "[ %s - %s ]  " % (pnum[1], num[1])



More information about the Yum-cvs-commits mailing list