[yum-cvs] yum cli.py,1.192,1.193 output.py,1.61,1.62
Seth Vidal
skvidal at login.linux.duke.edu
Tue Oct 25 15:42:16 UTC 2005
Update of /home/groups/yum/cvs/yum
In directory login:/tmp/cvs-serv21241
Modified Files:
cli.py output.py
Log Message:
fix up groupinfo command
Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- cli.py 25 Oct 2005 15:07:00 -0000 1.192
+++ cli.py 25 Oct 2005 15:42:13 -0000 1.193
@@ -1325,11 +1325,17 @@
if userlist is None:
userlist = self.extcmds
- for group in userlist:
- if self.groupInfo.groupExists(group):
- self.displayPkgsInGroups(group)
- else:
- self.errorlog(1, 'Warning: Group %s does not exist.' % group)
+ for strng in userlist:
+ matched = False
+ for group in self.comps.groups.values():
+ names = [ group.name, group.groupid]
+ names.extend(group.translated_name.values())
+ if strng in names:
+ self.displayPkgsInGroups(group)
+ matched = True
+
+ if not matched:
+ self.errorlog(1, 'Warning: Group %s does not exist.' % strng)
return 0, []
Index: output.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/output.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- output.py 13 Jun 2005 02:09:44 -0000 1.61
+++ output.py 25 Oct 2005 15:42:14 -0000 1.62
@@ -123,37 +123,24 @@
def displayPkgsInGroups(self, group):
- print '\nGroup: %s' % group
- groupid = self.groupInfo.matchGroup(group)
- if len(self.groupInfo.sub_groups[groupid]) > 0:
- print ' Required Groups:'
- for id in self.groupInfo.sub_groups[groupid]:
- grp = self.groupInfo.group_by_id[id]
- print ' %s' % grp.name
- if len(self.groupInfo.default_metapkgs[groupid]) > 0:
- print ' Default Metapkgs:'
- for id in self.groupInfo.default_metapkgs[groupid]:
- grp = self.groupInfo.group_by_id[id]
- print ' %s' % grp.name
- if len(self.groupInfo.optional_metapkgs[groupid]) > 0:
- print ' Optional Metapkgs:'
- for id in self.groupInfo.optional_metapkgs[groupid]:
- grp = self.groupInfo.group_by_id[id]
- print ' %s' % grp.name
- if len(self.groupInfo.mandatory_pkgs[groupid]) > 0:
+ print '\nGroup: %s' % group.name
+ if group.description != "":
+ print ' Description: %s' % group.description
+ if len(group.mandatory_packages.keys()) > 0:
print ' Mandatory Packages:'
- for item in self.groupInfo.mandatory_pkgs[groupid]:
+ for item in group.mandatory_packages.keys():
print ' %s' % item
- if len(self.groupInfo.default_pkgs[groupid]) > 0:
+
+ if len(group.default_packages.keys()) > 0:
print ' Default Packages:'
- for item in self.groupInfo.default_pkgs[groupid]:
+ for item in group.default_packages.keys():
print ' %s' % item
- if len(self.groupInfo.optional_pkgs[groupid]) > 0:
- print ' Optional Packages'
- for item in self.groupInfo.optional_pkgs[groupid]:
+
+ if len(group.optional_packages.keys()) > 0:
+ print ' Optional Packages:'
+ for item in group.optional_packages.keys():
print ' %s' % item
-
def depListOutput(self, results):
"""take a list of findDeps results and 'pretty print' the output"""
More information about the Yum-cvs-commits
mailing list