[yum-commits] 3 commits - cli.py yum/comps.py

[James Antill]

 cli.py       |    2 +-
 yum/comps.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a82638b521254c67618499f7b7f0178aa6ea700
Author: James Antill <james at and.org>
Date:   Thu Sep 13 09:56:28 2012 -0400

    Ignore --installroot=// etc. as a command line option.

diff --git a/cli.py b/cli.py
index adc3516..de00b14 100755
--- a/cli.py
+++ b/cli.py
@@ -2194,7 +2194,7 @@ class YumOptionParser(OptionParser):
         self._checkAbsInstallRoot(opts)
         # If the conf file is inside the  installroot - use that.
         # otherwise look for it in the normal root
-        if opts.installroot:
+        if opts.installroot and opts.installroot.lstrip('/'):
             if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
                 opts.conffile = opts.installroot+'/'+opts.conffile
             elif opts.conffile == '/etc/yum/yum.conf':
commit a11dd53753e8d43a5680c85519da272764e15baf
Merge: 564e133 f8b79c0
Author: James Antill <james at and.org>
Date:   Wed Sep 12 08:06:51 2012 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      URLGrabError => RepoError, to make skip_if_unavailable work.

commit 564e1335f44ebfc35dd40872915677cbc8e06054
Author: Jesse Keating <jkeating at redhat.com>
Date:   Tue Sep 11 16:01:42 2012 -0700

    Write out the right Environment syntax (#856372)
    
    The comps input has it as <groupid> not as <optionid>, and since it
    refers to a group, by ID, it makes sense to use <groupid> as the
    element tag.

diff --git a/yum/comps.py b/yum/comps.py
index 08e66b9..4e765ef 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -407,7 +407,7 @@ class Environment(CompsObj):
         msg += """    </grouplist>\n"""
         msg += """    <optionlist>\n"""
         for grp in self.options:
-            msg += """     <optionid>%s</optionid>\n""" % grp
+            msg += """     <groupid>%s</groupid>\n""" % grp
         msg += """    </optionlist>\n"""
         msg += """  </environment>\n"""