[yum-commits] 2 commits - yumcommands.py yummain.py

[zpavlas at osuosl.org]

 yumcommands.py |    2 --
 yummain.py     |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit fd77a9fda969bc633143120c3bd5c37c6875d140
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Tue Apr 17 13:41:07 2012 +0200

    Touch repoXML later, to handle RepoError properly.  Related: rhbz#769864
    
    The removed loop does not handle skip-if-unavailable option,
    while repos.populateSack() does.
    
    Forward port from RHEL6.3

diff --git a/yumcommands.py b/yumcommands.py
index 9c181ec..477d16a 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -1098,8 +1098,6 @@ class MakeCacheCommand(YumCommand):
                 repo.mdpolicy = "group:all"
             base.doRepoSetup(dosack=0)
             base.repos.doSetup()
-            for repo in base.repos.listEnabled():
-                repo.repoXML
             
             # These convert the downloaded data into usable data,
             # we can't remove them until *LoadRepo() can do:
commit f6e1940c9da37895eccb37228fcd8c1ba65a45fd
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Tue Apr 17 13:33:54 2012 +0200

    Check CWD earlier.  Related: rhbz#711358
    
    Check the current directory before instantiating YumBase,
    and before processing config and options.  This avoids
    a possible traceback with '-cfg' option.
    
    Forward port from RHEL6.3

diff --git a/yummain.py b/yummain.py
index c473df6..e3a232b 100755
--- a/yummain.py
+++ b/yummain.py
@@ -89,18 +89,6 @@ def main(args):
     logger = logging.getLogger("yum.main")
     verbose_logger = logging.getLogger("yum.verbose.main")
 
-    # our core object for the cli
-    base = cli.YumBaseCli()
-
-    # do our cli parsing and config file setup
-    # also sanity check the things being passed on the cli
-    try:
-        base.getOptionsConfig(args)
-    except plugins.PluginYumExit, e:
-        return exPluginExit(e)
-    except Errors.YumBaseError, e:
-        return exFatal(e)
-
     # Try to open the current directory to see if we have 
     # read and execute access. If not, chdir to /
     try:
@@ -118,6 +106,18 @@ def main(args):
             logger.critical(_('No getcwd() access in current directory, moving to /'))
             os.chdir("/")
 
+    # our core object for the cli
+    base = cli.YumBaseCli()
+
+    # do our cli parsing and config file setup
+    # also sanity check the things being passed on the cli
+    try:
+        base.getOptionsConfig(args)
+    except plugins.PluginYumExit, e:
+        return exPluginExit(e)
+    except Errors.YumBaseError, e:
+        return exFatal(e)
+
     lockerr = ""
     while True:
         try: