more adjustments for RPM API changes. this should fix the problems people

have seen with making dvds from rawhide (which doesn't have disc # info)

2 files changed, 5 insertions, 2 deletions

diff --git a/hdrlist.py b/hdrlist.py
index d508d512c..21d70a8da 100644
--- a/hdrlist.py
+++ b/hdrlist.py
@@ -278,6 +278,9 @@ class Package:
     def __getitem__(self, item):
         return self.hdr[item]
 
+    def keys(self):
+        return self.hdr.keys()
+
     def __repr__(self):
         return "%s" %(self.nevra(),)
 
diff --git a/image.py b/image.py
index 9a3daaaff..570d00052 100644
--- a/image.py
+++ b/image.py
@@ -179,7 +179,7 @@ class CdromInstallMethod(ImageInstallMethod):
 	return self.tree + "/" + filename
 
     def getRPMFilename(self, h, timer, callback=None):
-        if h[1000002] == None:
+        if h[1000002] == None or 1000002 not in h.keys():
             log ("header for %s has no disc location tag, assuming it's"
                  "on the current CD" %(h[1000000],))
         elif h[1000002] not in self.currentDisc:
@@ -482,7 +482,7 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 	# Make sure all of the correct CD images are available
 	missing_images = []
 	for h in hl.values():
-	    if h[1000002] is None:
+	    if h[1000002] is None or 1000002 not in h.keys():
 		continue
 	    
 	    if not self.discImages.has_key(h[1000002]):