r19149 - in /packages/unstable/update-manager/debian: changelog patches/65_pcache.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Mar 20 12:07:34 2009
New Revision: 19149

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19149
Log:
New patch, 65_pcache, fixes an exception with the new python-apt currently
in experimental; from upstream; thanks Michael Vogt.

Added:
    packages/unstable/update-manager/debian/patches/65_pcache.patch
Modified:
    packages/unstable/update-manager/debian/changelog

Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=19149&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog (original)
+++ packages/unstable/update-manager/debian/changelog Fri Mar 20 12:07:34 2009
@@ -1,8 +1,13 @@
 update-manager (0.68.debian-8) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * 10_update_translations.diff:
     + Updated Thai translations by Theppitak Karoonboonyanan.
       Closes: #512173.
+
+  [ Loic Minier ]
+  * New patch, 65_pcache, fixes an exception with the new python-apt currently
+    in experimental; from upstream; thanks Michael Vogt.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 27 Jan 2009 13:17:21 +0100
 

Added: packages/unstable/update-manager/debian/patches/65_pcache.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/patches/65_pcache.patch?rev=19149&op=file
==============================================================================
--- packages/unstable/update-manager/debian/patches/65_pcache.patch (added)
+++ packages/unstable/update-manager/debian/patches/65_pcache.patch Fri Mar 20 12:07:34 2009
@@ -1,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' update-manager-0.68.debian/UpdateManager/UpdateManager.py update-manager-0.68.debian.new/UpdateManager/UpdateManager.py
+--- update-manager-0.68.debian/UpdateManager/UpdateManager.py   2009-03-19 22:32:42.000000000 +0100
++++ update-manager-0.68.debian.new/UpdateManager/UpdateManager.py       2009-03-19 22:33:33.000000000 +0100
+@@ -142,7 +142,7 @@
+             # check if we have a match
+             for(verFileIter,index) in ver.FileList:
+                 if matcher.has_key((verFileIter.Archive, verFileIter.Origin)):
+-                    indexfile = pkg._list.FindIndex(verFileIter)
++                    indexfile = pkg._pcache._list.FindIndex(verFileIter)
+                     if indexfile and indexfile.IsTrusted:
+                         match = matcher[verFileIter.Archive, verFileIter.Origin]
+                         if match.importance > update_origin.importance:
+@@ -159,7 +159,7 @@
+         # assume "main" section
+         src_section = "main"
+         # use the section of the candidate as a starting point
+-        section = pkg._depcache.GetCandidateVer(pkg._pkg).Section
++        section = pkg._pcache._depcache.GetCandidateVer(pkg._pkg).Section
+
+         # get the source version, start with the binaries version
+         binver = pkg.candidateVersion