From ad2ec544545b2539d22e3dcdac945bd209542efa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Dec 2008 14:39:36 +0100 Subject: debian/rules: remove uneeded line for pydoc building --- debian/rules | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index adaad2a8..c8aff2f9 100755 --- a/debian/rules +++ b/debian/rules @@ -21,9 +21,6 @@ build/python-apt-dbg:: python$$i-dbg ./setup.py build; \ done -build/python-apt:: - pydoc -w - install/python-apt-dbg:: for i in $(cdbs_python_build_versions); do \ python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \ -- cgit v1.2.3 From fa9eee96831b3bb8964646e1b0415a059a498bd4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Jan 2009 16:34:20 +0100 Subject: fix bug in candidateInstalledSize property --- apt/package.py | 4 ++++ debian/changelog | 1 + 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/apt/package.py b/apt/package.py index 70ddbb1a..6af14b1f 100644 --- a/apt/package.py +++ b/apt/package.py @@ -384,6 +384,10 @@ class Package(object): def candidateInstalledSize(self, UseCandidate=True): """ The size of the candidate installed package """ ver = self._depcache.GetCandidateVer(self._pkg) + if ver: + return ver.Size + else: + return None candidateInstalledSize = property(candidateInstalledSize) def installedSize(self): diff --git a/debian/changelog b/debian/changelog index 160fe7c8..8b6780f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-apt (0.7.9) UNRELEASED; urgency=low - better description parsing - new method "installedFiles()" - new method "getChangelog()" + - fix bug in candidateInstalledSize property * apt/gtk/widgets.py: - new gobject GOpProgress - new gobject GFetchProgress -- cgit v1.2.3 From c906abf5f25479483041636813117c48556f389b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Jan 2009 16:48:09 +0100 Subject: * 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 --- aptsources/distinfo.py | 2 +- aptsources/distro.py | 25 ++++++++++++++----------- debian/changelog | 5 +++++ 3 files changed, 20 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index a6c0faf8..f4e804b2 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -132,7 +132,7 @@ class DistInfo: location = None match_loc = re.compile(r"^#LOC:(.+)$") - match_mirror_line = re.compile(r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://[A-Za-z/\.:\-_]+)$") + match_mirror_line = re.compile(r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://[A-Za-z0-9/\.:\-_]+)$") #match_mirror_line = re.compile(r".+") if not dist: diff --git a/aptsources/distro.py b/aptsources/distro.py index f271bbc4..0a094aed 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -211,31 +211,34 @@ 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]) # Only one server is used 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: - 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 [self._get_mirror_name(server), server, False] in mirrors: mirrors.append([self._get_mirror_name(server), server, False]) diff --git a/debian/changelog b/debian/changelog index 8b6780f5..042785d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,11 @@ python-apt (0.7.9) UNRELEASED; urgency=low * setup.py: - build html/ help of the apt and aptsources modules into /usr/share/doc/python-apt/html + * 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 -- Michael Vogt Mon, 24 Nov 2008 14:30:32 +0100 -- cgit v1.2.3