Merge lp:~jibel/synaptic/bug.513460 into lp:synaptic

[Jean-Baptiste Lallement]

I applied nearly the same checks than those to enable/disable the contextual menu entries.
It fixes the synaptic bug but there is still something odd with apt.

[Michael Vogt (mvo)]

Thanks! I merged it into the lucid branch, the next step is to merge into trunk/ and upload to debian.

=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2010-03-25 20:34:44 +0000
+++ gtk/rgmainwindow.cc	2010-04-11 11:29:16 +0000
@@ -641,6 +641,7 @@
    vector<RPackage *> exclude;
    vector<RPackage *> instPkgs;
    RPackage *pkg = NULL;
+   int flags;
 
    while (li != NULL) {
       pkgDepCache::ActionGroup group(*_lister->getCache()->deps());
@@ -650,6 +651,8 @@
       if (pkg == NULL)
          continue;
 
+      flags = pkg->getFlags();
+
       pkg->setNotify(false);
 
       // needed for the stateChange 
@@ -660,24 +663,34 @@
             pkgKeepHelper(pkg);
             break;
          case PKG_INSTALL:     // install
-            instPkgs.push_back(pkg);
-            pkgInstallHelper(pkg, false);
+            // install only if not installed
+            if(!(flags & RPackage::FInstalled))
+               pkgInstallHelper(pkg, false);
             break;
          case PKG_INSTALL_FROM_VERSION:     // install with specific version
-            pkgInstallHelper(pkg, false);
+            if(!(flags & RPackage::FInstalled))
+               pkgInstallHelper(pkg, false);
             break;
          case PKG_REINSTALL:      // reinstall
-	    instPkgs.push_back(pkg);
-	    pkgInstallHelper(pkg, false, true);
-	    break;
+            // Only reinstall installable packages and non outdated packages
+            if(flags & RPackage::FInstalled 
+               && !(flags & RPackage::FNotInstallable)
+               && !(flags & RPackage::FOutdated)) {
+               instPkgs.push_back(pkg);
+               pkgInstallHelper(pkg, false, true);
+            }
+            break;
          case PKG_DELETE:      // delete
-            pkgRemoveHelper(pkg);
+            if(flags & RPackage::FInstalled)
+               pkgRemoveHelper(pkg);
             break;
          case PKG_PURGE:       // purge
-            pkgRemoveHelper(pkg, true);
+            if(flags & RPackage::FInstalled || flags & RPackage::FResidualConfig)
+               pkgRemoveHelper(pkg, true);
             break;
          case PKG_DELETE_WITH_DEPS:
-            pkgRemoveHelper(pkg, true, true);
+            if(flags & RPackage::FInstalled || flags & RPackage::FResidualConfig)
+               pkgRemoveHelper(pkg, true, true);
             break;
          default:
             cout << "uh oh!!!!!!!!!" << endl;