[yum-commits] 4 commits - cli.py docs/yum.8 yum/__init__.py yum/yumRepo.py

[James Antill]

 cli.py          |   21 +++++++++++++++------
 docs/yum.8      |   17 ++++++++++-------
 yum/__init__.py |    6 ++++--
 yum/yumRepo.py  |    2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

New commits:
commit 039247f13bd6b9db827bd9a6234847276d2f5344
Author: James Antill <james at and.org>
Date:   Thu Aug 16 20:27:41 2012 -0400

    Fix typo of "pacakge" => "package". BZ 848811

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 35182d3..f831f23 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -943,7 +943,7 @@ Insufficient space in download directory %s
 
         if not package.verifyLocalPkg(): # Don't return as "success" when bad.
             msg = "Downloaded package %s, from %s, but it was invalid."
-            msg = msg % (package, pacakge.repo.id)
+            msg = msg % (package, package.repo.id)
             raise Errors.RepoError, msg
 
         return ret
commit dddb1ca71a9a2d04ddb319e8072f301a51dd7b87
Author: James Antill <james at and.org>
Date:   Thu Aug 16 16:25:22 2012 -0400

    Update group command documentation, for list changes. Tweak install @ text.

diff --git a/docs/yum.8 b/docs/yum.8
index 188cd3e..15a8345 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -89,9 +89,10 @@ Is used to install the latest version of a package or
 group of packages while ensuring that all dependencies are
 satisfied\&.  (See \fBSpecifying package names\fP for more information) 
 If no package matches the given package name(s), they are assumed to be a shell 
-glob and any matches are then installed\&. If the name starts with an 
-@ character the rest of the name is used as though passed to the groupinstall
-command\&. If the name starts with a - character, then a search is done within
+glob and any matches are then installed\&. If the name starts with @^ then it
+is treated as an environment group (group install @^foo), an @ character and
+it's treated as a group (plain group install)\&. If the name starts with
+a - character, then a search is done within
 the transaction and any matches are removed. If the name is a file, then install works
 like localinstall\&. If the name doesn't match a package, then package
 "provides" are searched (e.g. "_sqlitecache.so()(64bit)") as are
@@ -222,10 +223,12 @@ installed.
 "\fBgroup list\fP" is used to list the available groups from all \fByum\fP repos. Groups are marked
 as "installed" if all mandatory packages are installed, or if a group doesn't
 have any mandatory packages then it is installed if any of the optional or
-default package are installed.
-The optional "hidden" argument will also list groups marked as not being
-"user visible". If you pass the \-v option, to enable verbose mode, then the
-groupids are displayed.
+default package are installed (when not in group_command=objects mode).
+You can pass optional arguments to the list/summary commands: installed,
+available, environment, language, packages, hidden and ids (or any of those
+prefixed by "no" to turn them off again).
+If you pass the \-v option, to enable verbose mode, then the groupids are
+displayed by default (but "yum group list ids" is often easier to read).
 
 "\fBgroup remove\fP" is used to remove all of the packages in a group, unlike "groupinstall" this
 will remove everything regardless of group_package_types. It is worth pointing
commit 3148e95b07168acdc5312576b67fe257963fca2f
Author: James Antill <james at and.org>
Date:   Thu Aug 16 16:13:04 2012 -0400

    Better UI for installed/available and lang/pkg/env, in groups list/summary.

diff --git a/cli.py b/cli.py
index 8f8fdf9..c7d89a1 100755
--- a/cli.py
+++ b/cli.py
@@ -1622,13 +1622,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
                    }
         verb = self.verbose_logger.isEnabledFor(yum.logginglevels.DEBUG_3)
         wts = {'hidden' : False,
-               'lang'   : False,
-               'env'    : True,
-               'pkg'    : True,
-               'inst'   : True,
-               'avail'  : True,
+               'lang'   : None,
+               'env'    : None,
+               'pkg'    : None,
+               'inst'   : None,
+               'avail'  : None,
                'id'     : verb}
             
+        ouserlist = userlist[:]
         while userlist:
             arg = userlist[0]
             val = True
@@ -1642,6 +1643,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         if not userlist:
             userlist = None # Match everything...
 
+        if wts['inst'] is None and wts['avail'] is None:
+            wts['inst']  = True
+            wts['avail'] = True
+
+        if wts['lang'] is None and wts['pkg'] is None and wts['env'] is None:
+            wts['env'] = True
+            wts['pkg'] = True
+
         uv  = not wts['hidden']
         dGL = self.doGroupLists(patterns=userlist,
                                 uservisible=uv, return_evgrps=True)
@@ -1713,7 +1722,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
 
         if not done:
             self.logger.error(_('Warning: No Environments/Groups match: %s'),
-                              ", ".join(userlist))
+                              ", ".join(ouserlist))
             return 0, []
 
         return 0, [_('Done')]
commit bb5efaa5f3a7c701f7230b0e529dfc043e8f84db
Author: James Antill <james at and.org>
Date:   Thu Aug 16 16:04:45 2012 -0400

    Fix "yum upgrade" for group_command=objects.

diff --git a/yum/__init__.py b/yum/__init__.py
index c713cff..1108443 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3750,7 +3750,7 @@ much more problems).
                         self.verbose_logger.log(logginglevels.DEBUG_2,
                                                 msg, grpid, evgrp.environmentid)
                         continue
-                    grps.apped(grp)
+                    grps.append(grpid)
                 if evgrp.environmentid in self.igroups.environments:
                     ievgrp = self.igroups.environments[evgrp.environmentid]
                 else:
@@ -4700,8 +4700,10 @@ much more problems).
 
             # Upgrade the installed groups, as part of generic "yum upgrade"
             if self.conf.group_command == 'objects':
+                for ievgrp in self.igroups.environments:
+                    tx_return.extend(self._at_groupupgrade('@^' + ievgrp))
                 for igrp in self.igroups.groups:
-                    tx_return.extend(self._at_groupupgrade(igrp))
+                    tx_return.extend(self._at_groupupgrade('@'  + igrp))
 
             return tx_return