[yum-git] Branch 'yum-3_2_X' - 2 commits - docs/yum.8 yum/config.py

[James Antill]

 docs/yum.8    |    2 +-
 yum/config.py |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e8d9f3b44eba5897852a1ade5572cbcb832f1c0e
Author: James Antill <james at and.org>
Date:   Mon May 19 09:34:07 2008 -0400

    Fix -y config. option in man page: bug#447305

diff --git a/docs/yum.8 b/docs/yum.8
index 7b6bdeb..8845989 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -208,7 +208,7 @@ Help; display a help message and then quit\&.
 Assume yes; assume that the answer to any question which would be asked 
 is yes\&.
 .br
-Configuration Option: \fBassume\-yes\fP
+Configuration Option: \fBassumeyes\fP
 .IP "\fB\-c [config file]\fP" 
 Specifies the config file location - can take http, ftp urls and local file
 paths\&.
commit 2d93feb91f623bfca07e4508a49c995aa6a3c501
Author: James Antill <james at and.org>
Date:   Mon May 19 09:30:19 2008 -0400

    Allow -c URL to work again

diff --git a/yum/config.py b/yum/config.py
index fecdfe3..218008b 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -751,7 +751,10 @@ def readMainConfig(startupconf):
     
     # items related to the originating config file
     yumconf.config_file_path = startupconf.config_file_path
-    yumconf.config_file_age = os.stat(startupconf.config_file_path)[8]
+    if os.path.exists(startupconf.config_file_path):
+        yumconf.config_file_age = os.stat(startupconf.config_file_path)[8]
+    else:
+        yumconf.config_file_age = 0
     
     # propagate the debuglevel and errorlevel values:
     yumconf.debuglevel = startupconf.debuglevel