[yum-cvs] yum/yum __init__.py,1.300,1.301

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv20033

Modified Files:
	__init__.py 
Log Message:

fix merge conflict


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- __init__.py	4 Mar 2007 01:36:05 -0000	1.300
+++ __init__.py	4 Mar 2007 15:37:39 -0000	1.301
@@ -511,14 +511,17 @@
            it also is simply to only emit a log if anything actually gets populated"""
         
         necessary = False
-
-        for repo in self.repos.listEnabled():
-            if repo in repo.sack.added.keys():
-                if 'filelists' in repo.sack.added[repo]:
-                    continue
-            else:
-                necessary = True
         
+        # I can't think of a nice way of doing this, we have to have the sack here
+        # first or the below does nothing so...
+        if self.pkgSack:
+            for repo in self.repos.listEnabled():
+                if repo in repo.sack.added.keys():
+                    if 'filelists' in repo.sack.added[repo]:
+                        continue
+                else:
+                    necessary = True
+
         if necessary:
             msg = 'Importing additional filelist information'
             self.verbose_logger.log(logginglevels.INFO_2, msg)