← Back to branch summary

~ubuntu-branches/ubuntu/precise/aptdaemon/precise-security

« back to all changes in this revision

Viewing changes to debian/patches/fix-lp-932581.patch

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2012-10-12 15:59:48 UTC
  • mfrom: (96.1.8 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20121012155948-hqy6yy2s433jw1hl
Tags: 0.43+bzr805-0ubuntu7
https://launchpad.net/bugs/1052789
* SECURITY UPDATE: check downloaded keyid (LP: #1052789)
  - CVE-2012-0962

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-lp-932581.patch
 
1
Description: Fix GetUpdates on system with broken dependencies
 
2
Origin: upstream, commit:839, commit:806
 
3
Bug-Ubuntu: 932581
 
4
 
 
5
=== modified file 'aptdaemon/pkcompat.py'
 
6
--- old/aptdaemon/pkcompat.py   2012-04-02 12:34:42 +0000
 
7
+++ new/aptdaemon/pkcompat.py   2012-06-12 07:47:21 +0000
 
8
@@ -2138,7 +2138,10 @@
 
9
         self.cancellable = False
 
10
         self.progress = 101
 
11
         # Start with a safe upgrade
 
12
-        self._cache.upgrade(dist_upgrade=True)
 
13
+        try:
 
14
+            self._cache.upgrade(dist_upgrade=True)
 
15
+        except SystemError as excep:
 
16
+            pass
 
17
         for pkg in self._iterate_packages():
 
18
             if not pkg.is_upgradable:
 
19
                 continue
 
20