[Piuparts-commits] [piuparts] 02/12: lib/db: Package: use test_versions() in all places referring to a piuparts test
Holger Levsen
holger at layer-acht.org
Wed Oct 11 14:58:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 1c459eb170cbff0a94c048473888c60473cba4b5
Author: Andreas Beckmann <anbe at debian.org>
Date: Sun Sep 17 01:23:17 2017 +0200
lib/db: Package: use test_versions() in all places referring to a piuparts test
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
debian/changelog | 1 +
piuparts-master-backend.py | 8 ++++----
piuparts-report.py | 8 ++++----
piupartslib/packagesdb.py | 12 ++++++------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab3b1e8..8f5585e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ piuparts (0.83) UNRELEASED; urgency=medium
* piuparts.conf.anbe: Add some more example sections.
* piupartslib/packagesdb.py:
- Add new package data accessors name(), version(), test_versions().
+ - Use test_versions() in all places referring to a piuparts test.
-- Holger Levsen <holger at debian.org> Sat, 07 Oct 2017 17:42:12 +0200
diff --git a/piuparts-master-backend.py b/piuparts-master-backend.py
index 959bd38..3aa3a7d 100644
--- a/piuparts-master-backend.py
+++ b/piuparts-master-backend.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2011-2015 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2011-2017 Andreas Beckmann (anbe at debian.org)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -327,8 +327,8 @@ class Master(Protocol):
else:
self._clear_idle()
self._short_response("ok",
- package["Package"],
- package["Version"])
+ package.name(),
+ package.test_versions())
def _unreserve(self, command, args):
self._check_args(2, command, args)
@@ -369,7 +369,7 @@ class Master(Protocol):
def _state(self, command, args):
self._check_args(1, command, args)
self._short_response("ok", self._binary_db.get_package_state(args[0]),
- self._binary_db.get_package(args[0])["Version"])
+ self._binary_db.get_test_versions(args[0]))
# debug command
def _depends(self, command, args):
diff --git a/piuparts-report.py b/piuparts-report.py
index eb199da..41ea235 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -1115,7 +1115,7 @@ class Section:
defer_if_unmodified=True)
def create_source_summary(self, source, logs_by_dir):
- source_version = self._source_db.get_control_header(source, "Version")
+ source_version = self._source_db.get_test_versions(source)
binaries = self._source_db.get_control_header(source, "Binary")
maintainer = self._source_db.get_control_header(source, "Maintainer")
uploaders = self._source_db.get_control_header(source, "Uploaders")
@@ -1144,7 +1144,7 @@ class Section:
else:
state_style = "labelcell"
- binary_version = self._binary_db.get_control_header(binary, "Version")
+ binary_version = self._binary_db.get_test_versions(binary)
binary_arch = self._binary_db.get_control_header(binary, "Architecture")
archsuffix = ""
if binary_arch == "all":
@@ -1248,7 +1248,7 @@ class Section:
self.create_source_summary(source, logs_by_dir)
if source_state != "udeb":
- source_version = self._source_db.get_control_header(source, "Version")
+ source_version = self._source_db.get_test_versions(source)
source_data = {};
source_data["source"] = source
source_data["state"] = source_state
@@ -1503,7 +1503,7 @@ class Section:
self.archive_logfile(vdir, log)
logs_by_dir[vdir].remove(log)
else:
- current = self._binary_db.get_version(package)
+ current = self._binary_db.get_test_versions(package)
state = self._binary_db.get_package_state(package, resolve_virtual=False, recurse=False)
if version != current:
logging.debug("Archiving %s/%s, package is outdated (%s)" %
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index eeadb97..140d345 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -211,7 +211,7 @@ class LogDB:
return "%s_%s.log" % (package, version)
def log_exists(self, package, subdirs):
- log_name = self._log_name(package["Package"], package["Version"])
+ log_name = self._log_name(package.name(), package.test_versions())
for subdir in subdirs:
if self.exists(os.path.join(subdir, log_name)):
return True
@@ -780,7 +780,7 @@ class PackagesDB:
)
try:
- statobj = self._logdb.stat(self._recycle, p["Package"], p["Version"])
+ statobj = self._logdb.stat(self._recycle, p.name(), p.test_versions())
ctime = statobj[stat.ST_CTIME] # last inode modification = time of linking into recycle/
mtime = statobj[stat.ST_MTIME]
except OSError:
@@ -818,14 +818,14 @@ class PackagesDB:
if self._recycle_mode and self._logdb.log_exists(p, [self._recycle]):
for vdir in all_but_recycle:
if self._logdb.log_exists(p, [vdir]):
- self._logdb.remove(vdir, p["Package"], p["Version"])
- logging.info("Recycled %s %s %s" % (vdir, p["Package"], p["Version"]))
+ self._logdb.remove(vdir, p.name(), p.test_versions())
+ logging.info("Recycled %s %s %s" % (vdir, p.name(), p.test_versions()))
if self._logdb.log_exists(p, all_but_recycle):
self._remove_unavailable_candidate(p)
continue
if self._logdb.log_exists(p, [self._recycle]):
- self._logdb.remove(self._recycle, p["Package"], p["Version"])
- if self._logdb.create(self._reserved, p["Package"], p["Version"], ""):
+ self._logdb.remove(self._recycle, p.name(), p.test_versions())
+ if self._logdb.create(self._reserved, p.name(), p.test_versions(), ""):
return p
return None
--
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