- support lists or strings rather than one or the other in getPackagePaths()

2 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e139d06c..38625fb5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 
 	* fsset.py (FileSystemSet.setActive): don't set ksdata.clearpart["done"]
 
+	* installclasses/rhel.py (InstallClass.getPackagePaths): handle either
+	lists or bare strings in repopath values, so we don't have to worry
+	about keeping anaconda and rhel-instnum in sync so much (#221146,
+	#221260)
+
 2007-01-09  Peter Jones  <pjones@redhat.com>
 
 	* partedUtils.py (DiskSet.openDevices):
diff --git a/installclasses/rhel.py b/installclasses/rhel.py
index b02a3a32d..59159988d 100644
--- a/installclasses/rhel.py
+++ b/installclasses/rhel.py
@@ -79,14 +79,15 @@ class InstallClass(BaseInstallClass):
     def getPackagePaths(self, uri):
         rc = {}
         for (name, path) in self.repopaths.items():
+            if not type(uri) == types.ListType:
+                uri = [uri,]
+            if not type(path) == types.ListType:
+                path = [path,]
+
             lst = []
-            if type(uri) == types.ListType:
-                for i in uri:
-                    for p in path:
-                        lst.append("%s/%s" % (i, p))
-            else:
+            for i in uri:
                 for p in path:
-                    lst.append("%s/%s" % (uri, p))
+                    lst.append("%s/%s" % (i, p))
 
             rc[name] = lst
 
@@ -141,7 +142,12 @@ class InstallClass(BaseInstallClass):
                 self.repopaths["virt"] = ["VT"]
                 log.info("Adding Virtualization option")
 
-        for repo in reduce(lambda x,y: x+y, self.repopaths.values(), []):
+        def concat(x, y):
+            if not type(y) == types.ListType:
+                y = [y,]
+            return x+y
+
+        for repo in reduce(concat, self.repopaths.values(), []):
             if not self.taskMap.has_key(repo.lower()):
                 continue