diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-13 17:38:37 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-13 17:38:37 +0100 |
| commit | 85839f4f241c99f9e4ebb0a6a8847a2d433f1160 (patch) | |
| tree | 3778f55d63c20956cbb7ddee790d6ef69d26e267 | |
| parent | 38d602dc83006c51dfe4ed594d691ea9b0679498 (diff) | |
| parent | c906abf5f25479483041636813117c48556f389b (diff) | |
| download | python-apt-85839f4f241c99f9e4ebb0a6a8847a2d433f1160.tar.gz | |
* apt/package.py:
- fix bug in candidateInstalledSize property
* aptsources/distinfo.py:
- fix too restrictive mirror url check
* aptsources/distro.py:
- only add nearest_server and server to the mirrors if
they are defined
| -rw-r--r-- | apt/package.py | 4 | ||||
| -rw-r--r-- | aptsources/distro.py | 24 | ||||
| -rw-r--r-- | debian/changelog | 10 |
3 files changed, 28 insertions, 10 deletions
diff --git a/apt/package.py b/apt/package.py index 7817c64c..ecfd8b61 100644 --- a/apt/package.py +++ b/apt/package.py @@ -480,6 +480,10 @@ class Package(object): def candidateInstalledSize(self, UseCandidate=True): """Return the size of the candidate installed package.""" ver = self._depcache.GetCandidateVer(self._pkg) + if ver: + return ver.Size + else: + return None @property def installedSize(self): diff --git a/aptsources/distro.py b/aptsources/distro.py index d8f191d6..a28396b7 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -221,8 +221,9 @@ class Distribution: (len(self.used_servers) == 1 and \ compare_mirrors(self.used_servers[0], self.main_server)): mirrors.append([_("Main server"), self.main_server, True]) - mirrors.append([self._get_mirror_name(self.nearest_server), - self.nearest_server, False]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) elif len(self.used_servers) == 1 and not \ compare_mirrors(self.used_servers[0], self.main_server): mirrors.append([_("Main server"), self.main_server, False]) @@ -230,23 +231,26 @@ class Distribution: server = self.used_servers[0] # Append the nearest server if it's not already used - if not compare_mirrors(server, self.nearest_server): - mirrors.append([self._get_mirror_name(self.nearest_server), - self.nearest_server, False]) - mirrors.append([self._get_mirror_name(server), server, True]) + if self.nearest_server: + if not compare_mirrors(server, self.nearest_server): + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + if server: + mirrors.append([self._get_mirror_name(server), server, True]) elif len(self.used_servers) > 1: # More than one server is used. Since we don't handle this case # in the user interface we set "custom servers" to true and # append a list of all used servers mirrors.append([_("Main server"), self.main_server, False]) - mirrors.append([self._get_mirror_name(self.nearest_server), - self.nearest_server, False]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) mirrors.append([_("Custom servers"), None, True]) for server in self.used_servers: mirror_entry = [self._get_mirror_name(server), server, False] - if compare_mirrors(server, self.nearest_server) or\ - compare_mirrors(server, self.main_server): + if (compare_mirrors(server, self.nearest_server) or + compare_mirrors(server, self.main_server)): continue elif not mirror_entry in mirrors: mirrors.append(mirror_entry) diff --git a/debian/changelog b/debian/changelog index 49236999..976c72da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-apt (0.7.9~exp2) experimental; urgency=low + [ Julian Andres Klode ] * apt/*.py: - Almost complete cleanup of the code - Remove inconsistent use of tabs and spaces (Closes: #505443) @@ -31,6 +32,15 @@ python-apt (0.7.9~exp2) experimental; urgency=low * Merge Ben Finney's do not use has_key() (Closes: #481878) * Do not use deprecated form of raise statement (Closes: #494259) * Add support for PkgRecords.SHA256Hash (Closes: #456113) + + [ Michael Vogt ] + * apt/package.py: + - fix bug in candidateInstalledSize property + * aptsources/distinfo.py: + - fix too restrictive mirror url check + * aptsources/distro.py: + - only add nearest_server and server to the mirrors if + they are defined -- Julian Andres Klode <jak@debian.org> Sun, 11 Jan 2009 20:01:59 +0100 |