[Uludag-commits] r14618 - branches/package-manager-1.1/src

[uludag-commits at pardus.org.tr]

Author: faik
Date: Mon Jul  2 11:58:49 2007
New Revision: 14618

Modified:
   branches/package-manager-1.1/src/Commander.py
   branches/package-manager-1.1/src/Preferences.py
   branches/package-manager-1.1/src/package-manager.py
Log:
- remove filterReplaces code
- do not refresh componentlist while updating repo
- listNewPackages should also consider replaces



Modified: branches/package-manager-1.1/src/Commander.py
=================================================================
--- branches/package-manager-1.1/src/Commander.py	(original)
+++ branches/package-manager-1.1/src/Commander.py	Mon Jul  2 11:58:49 2007
@@ -158,7 +158,7 @@
         return list(pisi.api.list_installed())
 
     def listNewPackages(self):
-        return list(pisi.api.list_available() - pisi.api.list_installed())
+        return list(pisi.api.list_available() - pisi.api.list_installed() - set(pisi.api.list_replaces().values()))
 
     def packageGraph(self,list,ignoreInstalled=True):
         return pisi.api.package_graph(list, ignoreInstalled)

Modified: branches/package-manager-1.1/src/Preferences.py
=================================================================
--- branches/package-manager-1.1/src/Preferences.py	(original)
+++ branches/package-manager-1.1/src/Preferences.py	Mon Jul  2 11:58:49 2007
@@ -203,6 +203,7 @@
             self.parent.command.setRepositories(repoList)
             self.parent.progressDialog.setCurrentOperation(i18n("<b>Applying Repository Changes</b>"))
             self.parent.progressDialog.show()
+            return
 
         self.parent.refreshState()
 

Modified: branches/package-manager-1.1/src/package-manager.py
=================================================================
--- branches/package-manager-1.1/src/package-manager.py	(original)
+++ branches/package-manager-1.1/src/package-manager.py	Mon Jul  2 11:58:49 2007
@@ -271,7 +271,7 @@
         ##
 
         self.packageCache.clearCache()
-        upgradables = map(self.filterReplacement, pisi.api.list_upgradable())
+        upgradables = pisi.api.list_upgradable()
         self.createComponentList(upgradables, True)
         self.operateAction.setText(i18n("Upgrade Package(s)"))
         self.operateAction.setIconSet(loadIconSet("reload"))
@@ -282,14 +282,6 @@
         self.updateStatusBar()
         kapp.restoreOverrideCursor()
 
-    # <Replaces> type is added to pisi. But list_upgradable still returns the installed but upgradable 
-    # package list. But package manager has to show the to be upgraded package info.
-    def filterReplacement(self, pkg):
-        if pisi.context.packagedb.has_replacement(pkg):
-            return pisi.context.packagedb.get_replacement(pkg)
-        else:
-            return pkg
-    
     def clearPackageList(self):
         self.htmlPart.view().setContentsPos(0, 0)
         self.htmlPart.begin()