[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20171008-25-gace76be

[jturney at sourceware dot org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=ace76beb8608ccc0b4d41bda921421af32f11f5f

commit ace76beb8608ccc0b4d41bda921421af32f11f5f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Nov 9 22:27:52 2017 +0000

    Add the arch to the warning that files are being ignored

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=9d919ccf81bfd4532d06a2e1943d450cc2e050f7

commit 9d919ccf81bfd4532d06a2e1943d450cc2e050f7
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Nov 9 20:21:03 2017 +0000

    Log uploads once, rather than once for each arch


Diff:
---
 calm/calm.py    |   11 ++++++++---
 calm/uploads.py |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index 6f2ae7f..120d9c8 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -247,9 +247,14 @@ def process_uploads(args, state):
                 for arch in common_constants.ARCHES:
                     # use merged package list
                     state.packages[arch] = merged_packages[arch]
-                    msg = "added %d (%s) + %d (noarch) + %d (src) packages from maintainer %s" % (len(scan_result[arch].packages), arch, len(scan_result['noarch'].packages), len(scan_result['src'].packages), name)
-                    logging.debug(msg)
-                    irk.irk(msg)
+
+                # report what we've done
+                added = []
+                for arch in common_constants.ARCHES + ['noarch', 'src']:
+                    added.append('%d (%s)' % (len(scan_result[arch].packages), arch))
+                msg = "added %s packages from maintainer %s" % (' + '.join(added), name)
+                logging.debug(msg)
+                irk.irk(msg)
 
         # record updated reminder times for maintainers
         maintainers.Maintainer.update_reminder_times(mlist)
diff --git a/calm/uploads.py b/calm/uploads.py
index dc95d48..679fb9a 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -259,7 +259,7 @@ def scan(m, all_packages, arch, args):
     # since we warned about files being ignored, warn again
     if ignored > 0 and m.reminders_issued:
         if (time.time() > (m.reminder_time + REMINDER_INTERVAL)):
-            logging.warning("ignored %d files as there is no !ready" % ignored)
+            logging.warning("ignored %d files in %s as there is no !ready" % (ignored, arch))
 
     return ScanResult(error, packages, move, vault, remove, remove_success)