2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a3f46ddde..6a113f867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-30  Jeremy Katz  <katzj@redhat.com>
 
+	* image.py (findIsoImages): Skip ISOs which don't have a
+	product/RPMS dir to avoid some of the confusion if users put the
+	source ISOs in the same dir as the binary (#106017)
+
 	* network.py (Network.write): Write WEPKEY in
 	/etc/sysconfig/network-scripts/keys-$DEVNAME with mode 0600 (#140645)
 
diff --git a/image.py b/image.py
index 740ca4307..7d9434d22 100644
--- a/image.py
+++ b/image.py
@@ -459,6 +459,13 @@ def findIsoImages(path, messageWindow):
                     if (num == 1 and not
                         os.access("/mnt/cdimage/%s/base/stage2.img" % (productPath,),
                                   os.R_OK)):
+                        log("%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,)):
+                        log("%s doesn't have binary RPMS, skipping" %(what,))
                         continue
                     
 		    # warn user if images appears to be wrong size