From 17392fb24bce5dc310a303b681dbcd68f693b89c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 23 Jul 2016 13:40:08 +0100 Subject: Fix arch given when reporting a problem merging uploads Fix reporting of problems with the package set after uploads are merged to correctly identify the arch which has the problem. --- calm/calm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/calm/calm.py b/calm/calm.py index 0f41223..7c7ff4d 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -149,6 +149,7 @@ def process(args): # merge package sets merged_packages[arch] = package.merge(packages[arch], scan_result[arch].packages, scan_result['noarch'].packages) if not merged_packages[arch]: + logging.error("error while merging uploaded %s packages for %s" % (arch, name)) valid = False break @@ -160,11 +161,11 @@ def process(args): # validate the package set logging.debug("validating merged %s package set for maintainer %s" % (arch, name)) if not package.validate_packages(args, merged_packages[arch]): + logging.error("error while validating merged %s packages for %s" % (arch, name)) valid = False if not valid: # discard move list and merged_packages - logging.error("error while merging uploaded %s packages for %s" % (arch, name)) continue # for each arch and noarch -- cgit v1.2.3