[yum-commits] Branch 'yum-3_2_X' - 2 commits - cli.py docs/yum.conf.5

[James Antill]

 cli.py          |   12 ++++++++++++
 docs/yum.conf.5 |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 4de88735a89dd77e5c3d66ff23853d3d7956f268
Author: James Antill <james at and.org>
Date:   Tue Sep 28 15:27:39 2010 -0400

    Deal with relative installroot paths, BZ 638321.

diff --git a/cli.py b/cli.py
index 0accd35..f566f88 100644
--- a/cli.py
+++ b/cli.py
@@ -1396,6 +1396,7 @@ class YumOptionParser(OptionParser):
                 self.base.conf.obsoletes = 1
 
             if opts.installroot:
+                self._checkAbsInstallRoot(opts)
                 self.base.conf.installroot = opts.installroot
                 
             if opts.skipbroken:
@@ -1475,7 +1476,18 @@ class YumOptionParser(OptionParser):
          
         return opts, cmds
 
+    def _checkAbsInstallRoot(self, opts):
+        if not opts.installroot:
+            return
+        if opts.installroot[0] == '/':
+            return
+        # We have a relative installroot ... haha
+        self.logger.critical(_('--installroot must be an absolute path: %s'),
+                             opts.installroot)
+        sys.exit(1)
+
     def getRoot(self,opts):
+        self._checkAbsInstallRoot(opts)
         # If the conf file is inside the  installroot - use that.
         # otherwise look for it in the normal root
         if opts.installroot:
commit 3707e339600a54914c4f62ea5de8a9f7b7cbe847
Author: James Antill <james at and.org>
Date:   Tue Sep 28 11:45:10 2010 -0400

    Document that rhn-plugin will alter ssl* options.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 20a6e67..a5bd519 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -293,7 +293,11 @@ default
 
 .IP
 \fBsslverify \fR
-Boolean - should yum verify SSL certificates/hosts at all. Defaults to True
+Boolean - should yum verify SSL certificates/hosts at all. Defaults to True.
+
+Note that the plugin yum-rhn-plugin will force this value to true, and may
+alter other ssl settings (like hostname checking), even if it the machine
+is not registered.
 
 .IP
 \fBsslclientcert \fR