--- cdrom.image/updates/packages.py	2005/09/20 14:16:48	1.5
+++ cdrom.image/updates/packages.py	2005/10/07 20:55:54	1.6
@@ -55,8 +55,8 @@ def queryUpgradeContinue(intf, dir):
         sys.exit(0)
     return DISPATCH_FORWARD
 
-def doPostAction(id, instPath, intf):
-    id.instClass.postAction(instPath, flags.serial, intf)
+def doPostAction(id, instPath):
+    id.instClass.postAction(instPath, flags.serial)
 
 def firstbootConfiguration(id, instPath):
     if id.firstboot == FIRSTBOOT_RECONFIG:
@@ -1089,17 +1089,13 @@ def doPostInstall(method, id, intf, inst
     if flags.test:
 	return
 
+    w = intf.progressWindow(_("Post Install"),
+                            _("Performing post install configuration..."), 6)
+
     upgrade = id.upgrade.get()
     arch = iutil.getArch ()
 
     if upgrade:
-    	w = intf.progressWindow(_("Post Upgrade"),
-                            _("Performing post upgrade configuration..."), 6)
-    else:
-    	w = intf.progressWindow(_("Post Install"),
-                            _("Performing post install configuration..."), 6)
-
-    if upgrade:
 	logname = '/root/upgrade.log'
     else:
 	logname = '/root/install.log'