[Uludag-commits] r17608 - in branches/yali4/yali4: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Tue Apr  8 15:51:21 2008
New Revision: 17608

Modified:
   branches/yali4/yali4/gui/ScrCheckCD.py
   branches/yali4/yali4/pisiiface.py
Log:
 * Check Packages issues fixed. 

Modified: branches/yali4/yali4/gui/ScrCheckCD.py
=================================================================
--- branches/yali4/yali4/gui/ScrCheckCD.py	(original)
+++ branches/yali4/yali4/gui/ScrCheckCD.py	Tue Apr  8 15:51:21 2008
@@ -56,25 +56,32 @@
     def slotCheckCD(self):
         ctx.mainScreen.disableNext()
         ctx.mainScreen.disableBack()
+
         self.ui.checkButton.setEnabled(False)
+
         self.ui.checkLabel.setText(_('<font color="#FF6D19">Please wait while checking CD.</font>'))
-        yali4.pisiiface.initialize(ui=PisiUI())
+
+        yali4.pisiiface.initialize(ui = PisiUI(), with_comar = False, nodestDir = True)
         yali4.pisiiface.add_cd_repo()
+
         ctx.mainScreen.processEvents()
 
         pkg_names = yali4.pisiiface.get_available()
         self.ui.progressBar.setMaximum(len(pkg_names))
+
         cur = 0
         for pkg_name in pkg_names:
             cur += 1
+            ctx.debugger.log("Checking %s " % pkg_name)
             if yali4.pisiiface.check_package_hash(pkg_name):
                 self.ui.progressBar.setValue(cur)
             else:
-                yali4.pisiiface.finalize()
                 self.showError()
-        yali4.pisiiface.finalize()
 
         self.ui.checkLabel.setText(_('<font color="#257216">Check succeeded. You can proceed to the next screen.</font>'))
+
+        yali4.pisiiface.remove_repo(ctx.consts.cd_repo_name)
+
         ctx.mainScreen.enableNext()
         ctx.mainScreen.enableBack()
 

Modified: branches/yali4/yali4/pisiiface.py
=================================================================
--- branches/yali4/yali4/pisiiface.py	(original)
+++ branches/yali4/yali4/pisiiface.py	Tue Apr  8 15:51:21 2008
@@ -22,9 +22,10 @@
 
 repodb = pisi.db.repodb.RepoDB()
 
-def initialize(ui, with_comar=False):
+def initialize(ui, with_comar = False, nodestDir = False):
     options = pisi.config.Options()
-    options.destdir = consts.target_dir
+    if not nodestDir:
+        options.destdir = consts.target_dir
     options.yes_all = True
     # wait for chroot_dbus to initialize
     # generally we don't need this but I think this is safer