Merge lp:~mvo/update-manager/not-automatic2 into lp:update-manager

[Michael Vogt]

Unmerged revisions

1263. By Michael Vogt on 2011-02-18

UpdateManager/Core/MyCache.py: fix pkg._depcache -> self._depcache

1262. By Michael Vogt on 2011-02-18

merged with trunk

1261. By Michael Vogt on 2009-02-16

handle getting not-automatic: yes changelogs

1260. By Michael Vogt on 2009-02-16

make backports lower priority than distro updates, ensure that the autoamtic dependency is higher version than the regular one

1259. By Michael Vogt on 2009-02-16

refactoring, cleaner code that works UI agnostic

1258. By Michael Vogt on 2009-02-16

merge from the mainline

=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2011-05-19 23:20:43 +0000
+++ UpdateManager/Core/MyCache.py	2011-07-07 09:11:29 +0000
@@ -105,6 +105,52 @@
         assert self._depcache.broken_count == 0 and self._depcache.del_count == 0
         self._depcache.upgrade()
         return wouldDelete
+    def _has_ver_with_not_automatic_origin(self, pkg):
+        """
+        internal helper that checks if one pkg version has the
+        NotAutomatic flag
+        """
+        for ver in pkg._pkg.version_list:
+            for (verFileIter, index) in ver.file_list:
+                if verFileIter.not_automatic:
+                    return True
+        return False
+    def not_automatic_upgradable(self, pkg):
+        """
+        check if 'pkg' is upgradable but has the 'NotAutomatic' flag
+        """
+        if ( pkg.is_installed and
+             not pkg.is_upgradable and
+             pkg.candidate and
+             self._has_ver_with_not_automatic_origin(pkg) ):
+            # now check if there is a higher NotAutomatic version
+            candVer = self._depcache.get_candidate_ver(pkg._pkg)
+            for ver in pkg._pkg.version_list:
+                if apt_pkg.version_compare(ver.ver_str, candVer.ver_str) > 0:
+                    return True
+        return False
+    def mark_upgrade_install(self, pkg):
+        """
+        mark package for upgrade/install. we have a special version
+        here because update-manager deals with NotAutomatic by
+        explictely selecting it if there is no candidate already
+        """
+        # handle NotAutomatic: yes packages special
+        if self.not_automatic_upgradable(pkg):
+            for ver in pkg._pkg.version_list:
+                print "looking at: ", ver
+                for (verFileIter, index) in ver.file_list:
+                    if verFileIter.not_automatic:
+                        print "setting candidate ver: ", ver
+                        self._depcache.set_candidate_ver(pkg._pkg, ver)
+                        print "new cand: ", self._depcache.get_candidate_ver(pkg._pkg)
+                        self._depcache.mark_install(pkg._pkg)
+                        print "new cand: ", self._depcache.get_candidate_ver(pkg._pkg)
+                        break
+        pkg.mark_install()
+        print pkg.marked_install
+        print pkg.marked_upgrade
+        
     def matchPackageOrigin(self, pkg, matcher):
         """ match 'pkg' origin against 'matcher', take versions between
             installedVersion and candidateVersion into account too
@@ -175,7 +221,10 @@
 
         # get the source version, start with the binaries version
         binver = pkg.candidateVersion
-        srcver_epoch = pkg.candidateVersion
+        # handle not-automatic special
+        if self.notAutomaticUpgradable(pkg):
+            binver = pkg._pkg.VersionList[0].VerStr
+        srcver_epoch = binver
         srcver = self._strip_epoch(srcver_epoch)
         #print "bin: %s" % binver
 
 
=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2010-07-09 07:42:22 +0000
+++ UpdateManager/Core/UpdateList.py	2011-07-07 09:11:29 +0000
@@ -64,8 +64,8 @@
           ("%s-security" % dist, "Ubuntu", _("Important security updates"),10),
           ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9),
           ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8),
-          ("%s-backports" % dist, "Ubuntu", _("Backports"), 7),
-          (dist, "Ubuntu", _("Distribution updates"), 6)
+          (dist, "Ubuntu", _("Distribution updates"), 7),
+          ("%s-backports" % dist, "Ubuntu", _("Backports"), 6),
       ]
       matcher = {}
       for (origin, archive, desc, importance) in matcher_templates:
@@ -79,11 +79,11 @@
     # do the upgrade
     self.distUpgradeWouldDelete = cache.saveDistUpgrade()
 
-    dselect_upgrade_origin = UpdateOrigin(_("Previous selected"), 1)
-
     # sort by origin
     for pkg in cache:
-      if pkg.is_upgradable or pkg.marked_install:
+      if (pkg.is_upgradable or
+          pkg.marked_install or 
+          cache.not_automatic_upgradable(pkg)):
         if pkg.candidateOrigin == None:
             # can happen for e.g. locked packages
             # FIXME: do something more sensible here (but what?)
 
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2011-06-23 00:10:55 +0000
+++ UpdateManager/UpdateManager.py	2011-07-07 09:11:29 +0000
@@ -885,6 +885,7 @@
           
       pkg = self.store.get_value(iter, LIST_PKG)
       origin = self.store.get_value(iter, LIST_ORIGIN)
+
       if pkg is not None:
           return
       self.toggle_from_origin(pkg, origin, True)
@@ -909,6 +910,7 @@
   
   def toggled(self, renderer, path):
     """ a toggle button in the listview was toggled """
+    print "toggled"
     iter = self.store.get_iter(path)
     pkg = self.store.get_value(iter, LIST_PKG)
     origin = self.store.get_value(iter, LIST_ORIGIN)
@@ -931,7 +933,7 @@
             Fix = apt_pkg.ProblemResolver(self.cache._depcache)
             Fix.resolve_by_keep()
     else:
-        pkg.mark_install()
+        self.cache.mark_upgrade_install(pkg)
     self.treeview_update.queue_draw()
     self.refresh_updates_count()
     self.setBusy(False)
 
=== modified file 'UpdateManagerText/UpdateManagerText.py'
--- UpdateManagerText/UpdateManagerText.py	2011-03-30 08:31:21 +0000
+++ UpdateManagerText/UpdateManagerText.py	2011-07-07 09:11:29 +0000
@@ -151,7 +151,7 @@
                     if not (name in self.list.held_back):
                         # FIXME: properly deal with "fromUser" here
                         need_refresh = True
-                        pkg.markInstall()
+                        self.cache.markUpgradeInstall(pkg)
                 # fixup any problems
                 if self.cache._depcache.BrokenCount:
                     need_refresh = True
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-07 09:05:34 +0000
+++ debian/changelog	2011-07-07 09:11:29 +0000
@@ -2307,6 +2307,27 @@
 
  -- Michael Vogt <[e-mail]>  Wed, 18 Feb 2009 23:44:17 +0100
 
+update-manager (1:0.97.2) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * DistUpgrade/DistUpgradeController.py:
+    - fixes in the error string (thanks to Jean-Baptiste 
+      Lallement, LP: #298296)
+  * support getting NEWS.Debian information in addition
+    to the changelog
+  * debian/update-manager-core.links:
+    - fix typo (thanks to tjaalton)
+  * merge the "not-automatic" branch to support components
+    that have the "NotAutomatic: yes" flag in their release
+    file
+
+  [ Brian Murray ]
+  * DistUpgrade - Release Announcements:
+    - Modified reporting bugs sections to recommend using ubuntu-bug instead
+      of filing bugs directly in Launchpad. (LP: #327800)
+
+ -- Brian Murray <[e-mail]>  Wed, 11 Feb 2009 08:29:48 -0800
+
 update-manager (1:0.97.1) jaunty; urgency=low
 
   [ Michael Vogt ]