move filename generation to method

2 files changed, 7 insertions, 3 deletions

diff --git a/anaconda b/anaconda
index c0a4c387b..22f52a6dc 100755
--- a/anaconda
+++ b/anaconda
@@ -53,9 +53,10 @@ import rpm
 
 def cb(what, amount, total, key, data):
     if (what == rpm.RPMCALLBACK_INST_OPEN_FILE):
-	(h, key) = key
+	(h, method) = key
 	data.setPackage(h[rpm.RPMTAG_NAME])
-	d = os.open("/mnt/redhat/test/6.0/i386/RedHat/RPMS/" + key, os.O_RDONLY)
+	fn = method.getFilename(h)
+	d = os.open(fn, os.O_RDONLY)
 	return d
 
 if (mode == 'g' and not os.environ.has_key('DISPLAY')):
@@ -93,7 +94,7 @@ db = rpm.opendb(1, rootPath)
 ts = rpm.TransactionSet(rootPath, db)
 
 for p in comps.selected():
-    ts.add(p.h, (p.h, p.h[1000000]))
+    ts.add(p.h, (p.h, method))
 
 ts.order()
 p = intf.packageProgessWindow()
diff --git a/image.py b/image.py
index 426c2deb0..8177e4363 100644
--- a/image.py
+++ b/image.py
@@ -4,6 +4,9 @@ import rpm
 
 class InstallMethod:
 
+    def getFilename(self, h):
+	return self.tree + "/" + "RedHat/RPMS/" + h[1000000]
+
     def readHeaders(self):
 	return rpm.readHeaderList(self.tree + "/RedHat/base/hdlist")