extras-repoclosure rc-modified,1.31,1.32

Michael Schwendt mschwendt at fedoraproject.org
Mon Sep 7 09:31:57 UTC 2009


Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17377

Modified Files:
	rc-modified 
Log Message:
revert previous commit, breaks the tool really badly


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rc-modified	7 Sep 2009 09:28:52 -0000	1.31
+++ rc-modified	7 Sep 2009 09:31:56 -0000	1.32
@@ -70,10 +70,7 @@
     def __init__(self, arch = None, config = "/etc/yum.conf"):
         yum.YumBase.__init__(self)
 
-        if yum.__version__ < '3.2.24':
-            self.arch = arch
-        else:
-            self._rc_arches = arch
+        self.arch = arch
         if yum.__version__ < '3.0':  # TODO: check
             self.doConfigSetup(fn = config)
         else:
@@ -106,18 +103,7 @@
     
     def readMetadata(self):
         self.doRepoSetup()
-
-        if yum.__version__ < '3.2.24':
-            self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
-        else:
-            archs = []
-            if not self._rc_arches:
-                archs.extend(self.arch.archlist)
-            else:
-                for arch in self._rc_arches:
-                    archs.extend(self.arch.get_arch_list(arch))
-            self.doSackSetup(archs)
-
+        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
         for repo in self.repos.listEnabled():
             try:  # TODO: when exactly did this change from "with=" to "mdtype="?
                 self.repos.populateSack(which=[repo.id], mdtype='filelists')




More information about the fedora-extras-commits mailing list