Muehlenhoff has submitted this change and it was merged. Change subject: Bugfixes ......................................................................
Bugfixes * Fix a traceback in status display * List hosts needing a restart by default instead of only showing the amount of processes requiring a restart Change-Id: I40e9cf27dfcd32c59000eee4ae37ef2d9927f997 --- M debian/changelog M master/debdeploy 2 files changed, 17 insertions(+), 4 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 01a3036..c56876f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debdeploy (0.0.10-1) jessie-wikimedia; urgency=medium + + * Fix a traceback in status display + * List hosts needing a restart by default instead of only showing + the amount of processes requiring a restart + + -- Moritz Muehlenhoff <[email protected]> Fri, 20 Nov 2015 12:50:01 +0100 + debdeploy (0.0.9-1) jessie-wikimedia; urgency=medium * Tweak logging and make debug logging configurable diff --git a/master/debdeploy b/master/debdeploy index d662623..3cc963f 100755 --- a/master/debdeploy +++ b/master/debdeploy @@ -127,9 +127,10 @@ for process in restart: if len(process) > 0: if not restart_cnt.get(process, None): - restart_cnt[process] = 1 + restart_cnt[process] = [] + restart_cnt[process].append(host) else: - restart_cnt[process] += 1 + restart_cnt[process].append(host) # Detect installation errors and collect them to display an error list # across all Salt grains @@ -186,7 +187,11 @@ else: print "Restarts needed:" for process in sorted(restart_cnt.keys()): - print process, "on", restart_cnt[process], "hosts" + print process, "on", len(restart_cnt[process]), "hosts:" + print " ", + for i in restart_cnt[process]: + print i, + print print print "Error summary:" @@ -223,7 +228,7 @@ sys.exit(1) if joblogdb.has_been_rolled_back(update_file, servergroup): - print update_file, "was already deployed and rolled back for this server group (identified by grain", i, "), if you want to redeploy you need to assign a different name" + print update_file, "was already deployed and rolled back for this server group, if you want to redeploy you need to assign a different name" sys.exit(1) if joblogdb.does_job_exist(update_file, servergroup): -- To view, visit https://gerrit.wikimedia.org/r/254395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40e9cf27dfcd32c59000eee4ae37ef2d9927f997 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/debdeploy Gerrit-Branch: master Gerrit-Owner: Muehlenhoff <[email protected]> Gerrit-Reviewer: Muehlenhoff <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
