[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/comps.py yum/yumRepo.py

[James Antill]

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

New commits:
commit 9ff0d3ee7cb08e85a3fe6f39c3417ee3be6dc080
Author: James Antill <james at and.org>
Date:   Thu Nov 6 10:34:55 2008 -0500

    Don't die if we haven't downloaded anything before we get the URLGrabError

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index b762deb..decc662 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -207,7 +207,10 @@ class YumPackageSack(packageSack.PackageSack):
                 repo.checkMD(db_un_fn, mdtype, openchecksum=True)
             except URLGrabError:
                 if not repo.cache:
-                    os.unlink(db_un_fn)
+                    try:
+                        os.unlink(db_un_fn)
+                    except: # Could have an error before anything happens
+                        pass
             else:
                 result = db_un_fn
 
commit 65bf1d5f6ba89ad1f70306525c390f7e11615dc5
Author: James Antill <james at and.org>
Date:   Tue Nov 4 18:14:09 2008 -0500

    Minor comment copy/paste fix, group => category

diff --git a/yum/comps.py b/yum/comps.py
index f5af0bd..6820c64 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -354,7 +354,7 @@ class Category(CompsObj):
                 self.translated_description[lang] = obj.translated_description[lang]
 
     def xml(self):
-        """write out an xml stanza for the group object"""
+        """write out an xml stanza for the category object"""
         msg ="""        
   <category>
    <id>%s</id>