[Uludag-commits] r16990 - trunk/tasma/package-manager/src

[uludag-commits at pardus.org.tr]

Author: gokcen.eraslan
Date: Tue Feb  5 18:30:56 2008
New Revision: 16990

Modified:
   trunk/tasma/package-manager/src/Commander.py
   trunk/tasma/package-manager/src/MainWidget.py
Log:
handle comar warnings

Modified: trunk/tasma/package-manager/src/Commander.py
=================================================================
--- trunk/tasma/package-manager/src/Commander.py	(original)
+++ trunk/tasma/package-manager/src/Commander.py	Tue Feb  5 18:30:56 2008
@@ -80,6 +80,11 @@
                 self.parent.finished(data)
             elif notification == "System.Manager.updatingRepo":
                 pass
+            elif notification == "System.Manager.warning":
+                self.comar.com_lock.unlock()
+                self.parent.showWarningMessage(data)
+                self.parent.resetState()
+                self.parent.refreshState()
             else:
                 print "Got notification : %s , for script : %s , with data : %s" % (notification, script, data)
         # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If
@@ -156,7 +161,7 @@
 
     def listNewPackages(self):
         return list((set(pisi.api.list_available()) - set(pisi.api.list_installed())) - set(pisi.api.list_replaces().values()))
-    
+
     def packageGraph(self,list,ignoreInstalled=True):
         return pisi.api.package_graph(list, ignoreInstalled)
 

Modified: trunk/tasma/package-manager/src/MainWidget.py
=================================================================
--- trunk/tasma/package-manager/src/MainWidget.py	(original)
+++ trunk/tasma/package-manager/src/MainWidget.py	Tue Feb  5 18:30:56 2008
@@ -226,7 +226,7 @@
         self.processEvents()
         packages = self.command.listPackages()
         self.state = remove_state
-        self.createComponentList(packages, True)
+        self.createComponentList(packages)
         self.operateAction.setText(i18n("Remove Package(s)"))
         self.operateAction.setIconSet(loadIconSet("no"))
         self.basket.setState(self.state)
@@ -657,6 +657,11 @@
             self.progressDialog.setCurrentOperation(i18n("<b>Updating Repository</b>"))
             self.progressDialog.setOperationDescription(i18n('Downloading package list of %1').arg(data[1]))
 
+    def showWarningMessage(self, message, warning=None):
+        if not warning:
+            warning=i18n("Warning")
+        KMessageBox.sorry(self, message, warning)
+
     def showErrorMessage(self, message, error=None):
         #bug: 6479
         #if error=i18n("Error") is written above, it isn't translated
@@ -680,6 +685,7 @@
     def finished(self, command=None):
         # when pisi db version is upgraded, reload is needed before init
         packages = self.basket.packages + self.basket.extraPackages
+        print "in finished(): command=%s" % command
         if command == "System.Manager.updatePackage" and "pisi" in packages:
             self.reloadPisi()