[Piuparts-commits] [piuparts] 02/03: p-m, p-r: use load_alternate_versions_from_packages_urls()
Holger Levsen
holger at moszumanska.debian.org
Tue Jan 21 14:28:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit f56e0b452c802bffc35f1a6aa52c4563ff91f751
Author: Andreas Beckmann <anbe at debian.org>
Date: Tue Jan 21 13:04:37 2014 +0100
p-m,p-r: use load_alternate_versions_from_packages_urls()
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
piuparts-master-backend.py | 8 +-------
piuparts-report.py | 14 +++++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/piuparts-master-backend.py b/piuparts-master-backend.py
index 2784949..293f7a1 100644
--- a/piuparts-master-backend.py
+++ b/piuparts-master-backend.py
@@ -213,17 +213,11 @@ class Master(Protocol):
config.get_arch()))
if config.get_distro() != config.get_final_distro():
# take version numbers (or None) from final distro
- db2 = piupartslib.packagesdb.PackagesFile()
- db2.load_packages_urls(
+ db.load_alternate_versions_from_packages_urls(
distro_config.get_packages_urls(
config.get_final_distro(),
config.get_area(),
config.get_arch()))
- for package in db.get_all_packages():
- if package["Package"] in db2:
- package["Version"] = db2[package["Package"]]["Version"]
- else:
- package["Version"] = "None"
def _clear_idle(self):
if not self._idle_mode is False:
diff --git a/piuparts-report.py b/piuparts-report.py
index e848492..42f6101 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -694,6 +694,12 @@ class Section:
self._source_db = piupartslib.packagesdb.PackagesDB()
self._source_db.load_packages_urls(
self._distro_config.get_sources_urls(
+ self._config.get_distro(),
+ self._config.get_area()))
+ if self._config.get_distro() != self._config.get_final_distro():
+ # take version numbers (or None) from final distro
+ self._source_db.load_alternate_versions_from_packages_urls(
+ self._distro_config.get_sources_urls(
self._config.get_final_distro(),
self._config.get_area()))
@@ -730,17 +736,11 @@ class Section:
config.get_arch()))
if config.get_distro() != config.get_final_distro():
# take version numbers (or None) from final distro
- db2 = piupartslib.packagesdb.PackagesFile()
- db2.load_packages_urls(
+ db.load_alternate_versions_from_packages_urls(
self._distro_config.get_packages_urls(
config.get_final_distro(),
config.get_area(),
config.get_arch()))
- for package in db.get_all_packages():
- if package["Package"] in db2:
- package["Version"] = db2[package["Package"]]["Version"]
- else:
- package["Version"] = "None"
def _write_template_html(self, filename, body, mapping={}):
mapping = mapping.copy()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list