r11741 - in /packages/unstable/update-manager/debian: changelog patches/04_mark_keep_in_group.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Jun 30 17:31:38 2007
New Revision: 11741

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11741
Log:
reworked patch to work with older versions of python-apt

Modified:
    packages/unstable/update-manager/debian/changelog
    packages/unstable/update-manager/debian/patches/04_mark_keep_in_group.diff

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=11741&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog (original)
+++ packages/unstable/update-manager/debian/changelog Sat Jun 30 17:31:38 2007
@@ -1,6 +1,16 @@
+update-manager (0.42.2ubuntu22-14) UNRELEASED; urgency=high
+
+  * Urgency set to high because the bug it addresses affects every testing
+    user, and is the only being fixed
+  * debian/patches/04_mark_keep_in_group.diff:
+  - reworked to only use actiongroup if it is available from apt_pkg
+    (Closes: #431114)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon, 18 Jun 2007 20:16:11 +0100
+
 update-manager (0.42.2ubuntu22-13) unstable; urgency=low
 
-  * debian/patches/:
+  * debian/patches/04_mark_keep_in_group.diff:
   - fix problem with huge slowness in startup, thanks to
     Matt Karai for the patch (Closes: #428897)
 

Modified: packages/unstable/update-manager/debian/patches/04_mark_keep_in_group.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/patches/04_mark_keep_in_group.diff?rev=11741&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/patches/04_mark_keep_in_group.diff (original)
+++ packages/unstable/update-manager/debian/patches/04_mark_keep_in_group.diff Sat Jun 30 17:31:38 2007
@@ -1,18 +1,21 @@
-diff -ru update-manager-0.42.2ubuntu22-old/UpdateManager/UpdateManager.py update-manager-0.42.2ubuntu22/UpdateManager/UpdateManager.py
---- update-manager-0.42.2ubuntu22-old/UpdateManager/UpdateManager.py	2006-05-24 08:14:21.000000000 -0700
-+++ update-manager-0.42.2ubuntu22/UpdateManager/UpdateManager.py	2007-06-16 10:55:18.000000000 -0700
-@@ -83,8 +83,12 @@
+diff -urN update-manager-0.42.2ubuntu22.old/UpdateManager/UpdateManager.py update-manager-0.42.2ubuntu22/UpdateManager/UpdateManager.py
+--- update-manager-0.42.2ubuntu22.old/UpdateManager/UpdateManager.py	2006-05-24 12:14:21.000000000 -0300
++++ update-manager-0.42.2ubuntu22/UpdateManager/UpdateManager.py	2007-06-30 14:00:49.000000000 -0300
+@@ -83,8 +83,15 @@
          assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0
          self.all_changes = {}
      def clean(self):
 -        for pkg in self:
 -            pkg.markKeep()
-+        action_group = apt_pkg.GetPkgActionGroup(self._depcache)
++        GetPkgActionGroup = getattr(apt_pkg, 'GetPkgActionGrup', None)
++        if GetPkgActionGroup:
++            action_group = GetPkgActionGroup(self._depcache)
 +        try:
 +            for pkg in self:
 +                pkg.markKeep()
 +        finally:
-+            action_group.release()
++            if GetPkgActionGroup:
++                action_group.release()
      def saveDistUpgrade(self):
          """ this functions mimics a upgrade but will never remove anything """
          self._depcache.Upgrade(True)