[yum-cvs] yum/yum __init__.py,1.166,1.167 comps.py,1.6,1.7

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv3276/yum

Modified Files:
	__init__.py comps.py 
Log Message:
* fix a few typos in the group code
* parse the order as an integer instead of a boolean
* default groups without an order to be a high number instead of 0 (so they
  end up shown later)


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- __init__.py	9 Dec 2005 17:05:41 -0000	1.166
+++ __init__.py	11 Dec 2005 00:38:38 -0000	1.167
@@ -1253,7 +1253,7 @@
         if not self.comps:
             self.doGroupSetup()
         
-        if not self.comps.has_grou(grpid):
+        if not self.comps.has_group(grpid):
             raise Errors.GroupsError, "No Group named %s exists" % grpid
             
         thisgroup = self.comps.return_group(grpid)

Index: comps.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/comps.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- comps.py	9 Dec 2005 15:32:00 -0000	1.6
+++ comps.py	11 Dec 2005 00:38:38 -0000	1.7
@@ -26,7 +26,10 @@
         return BOOLEAN_STATES[strng.lower()]
     else:
         return False
-        
+
+def parse_number(strng):
+    return int(strng)
+
 class CompsException(exceptions.Exception):
     pass
         
@@ -44,7 +47,7 @@
         self.default_packages = {}
         self.langonly = None ## what the hell is this?
         self.groupid = None
-        self.display_order = 0
+        self.display_order = 1024
         self.installed = False
         
 
@@ -112,7 +115,7 @@
                 self.user_visible = parse_boolean(child.text)
     
             elif child.tag == 'display_order':
-                self.display_order = parse_boolean(child.text)
+                self.display_order = parse_number(child.text)
 
             elif child.tag == 'default':
                 self.default = parse_boolean(child.text)
@@ -177,7 +180,7 @@
         self.description = ""
         self.translated_name = {}
         self.translated_description = {}
-        self.display_order = 0
+        self.display_order = 1024
         self._groups = {}        
 
         if elem:
@@ -225,7 +228,7 @@
                 self.parse_group_list(child)
 
             elif child.tag == 'display_order':
-                self.display_order = parse_boolean(child.text)
+                self.display_order = parse_number(child.text)
 
     def parse_group_list(self, grouplist_elem):
         for child in grouplist_elem:
@@ -257,8 +260,8 @@
         self.overwrite_groups = overwrite_groups
         self.compiled = False # have groups been compiled into avail/installed 
                               # lists, yet.
-    
-    
+
+
     def __sort_order(self, item1, item2):
         if item1.display_order > item2.display_order:
             return 1
@@ -293,7 +296,7 @@
     
     def return_group(self, grpid):
         if self._groups.has_key(grpid):
-            return self._groups(grpid)
+            return self._groups[grpid]
         
         # do matches against group names and ids, too
         for group in self.groups: