Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2016-07-23 15:40:08 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2016-07-23 15:40:08 +0300
commit17392fb24bce5dc310a303b681dbcd68f693b89c (patch)
tree8d32810be62ce9ac4b394a0aa3954b64ea129706
parent8f11d8dff54e7d61a9641867b8cfeea320948099 (diff)
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.
-rwxr-xr-xcalm/calm.py3
1 files changed, 2 insertions, 1 deletions
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