2006-08-16 Jeremy Katz <katzj@redhat.com>

	* image.py (findIsoImages): Adjust for changed paths

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 30c8b9344..9725e2471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-08-16  Jeremy Katz  <katzj@redhat.com>
 
+	* image.py (findIsoImages): Adjust for changed paths
+
 	* installclasses/rhel.py (InstallClass.handleRegKey): More tweaks
 	based on what really exists
 
diff --git a/image.py b/image.py
index d24584a34..17e5729e9 100644
--- a/image.py
+++ b/image.py
@@ -421,10 +421,10 @@ def findIsoImages(path, messageWindow):
                         os.access("/mnt/cdimage/images/stage2.img", os.R_OK)):
                         log.warning("%s doesn't have a stage2.img, skipping" %(what,))
                         continue
-                    # we only install binary packages and they have to be
-                    # in the product/RPMS/ dir.  make sure it exists to
-                    # avoid overwriting discs[2] with disc2 of the src.rpm set
-                    if not os.path.isdir("/mnt/cdimage/%s/RPMS" %(productPath,)):
+                    # we only install binary packages, so let's look for a
+                    # product/ dir and hope that this avoids getting
+                    # discs from the src.rpm set
+                    if not os.path.isdir("/mnt/cdimage/%s" %(productPath,)):
                         log.warning("%s doesn't have binary RPMS, skipping" %(what,))
                         continue