gerritbot/send-daily-digest | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 7ae28f0bde27cedfeaef9eda3725b36c37eafac2 Author: Bjoern Michaelsen <[email protected]> Date: Tue Jun 11 11:26:03 2013 +0200 we want to highlight old changes that are either CR-1 OR V-1, not requiring both diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest index 47b258d..c7847ae 100755 --- a/gerritbot/send-daily-digest +++ b/gerritbot/send-daily-digest @@ -42,7 +42,7 @@ def create_message(gerrit, age): body += '\n\n* Abandoned changes on master for project core changed in the last %d hours:\n\n' % age body += get_digest(gerrit, get_daily_query('abandoned', age)) body += '\n\n* Open changes needing tweaks, but being untouched for more than a week:\n\end-daily-digest' - body += get_digest(gerrit, 'project:core branch:master status:open (label:Code-Review<=-1 label:Verified<=-1) age:1w') + body += get_digest(gerrit, 'project:core branch:master status:open (label:Code-Review<=-1 OR label:Verified<=-1) age:1w') body += ''' Best, commit 45f825621e3c40065e88052e916ec602d45c016d Author: Mathias Michel <[email protected]> Date: Tue Jun 11 01:19:35 2013 +0200 Improve mail formatting & fix query parsing diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest index f18579f..47b258d 100755 --- a/gerritbot/send-daily-digest +++ b/gerritbot/send-daily-digest @@ -24,24 +24,24 @@ def get_daily_query(status, age): def get_digest(gerrit, query): digest = '' - for line in sh.ssh(gerrit, 'gerrit query --format=JSON \'%s\'' % query).strip().split('\n'): + for line in sh.ssh(gerrit, 'gerrit query --format=JSON -- \'%s\'' % query).strip().split('\n'): change = json.loads(line) if 'url' in change.keys(): - digest += '%s %s %s\n' % (change['url'], change['subject'].ljust(75)[:75], change['owner']['email']) + digest += '%s\n in %s from %s\n' % (change['subject'].ljust(75)[:75], change['url'], change['owner']['name']) if digest == '': digest = 'None' return digest - + def create_message(gerrit, age): now = datetime.datetime.now() body = 'Moin!\n\n' - body += 'open changes on master for project core changed in the last %d hours:\n' % age + body += '* Open changes on master for project core changed in the last %d hours:\n\n' % age body += get_digest(gerrit, get_daily_query('open', age)) - body += '\n\nmerged changes on master for project core changed in the last %d hours:\n' % age + body += '\n\n* Merged changes on master for project core changed in the last %d hours:\n\n' % age body += get_digest(gerrit, get_daily_query('merged', age)) - body += '\n\nabandoned changes on master for project core changed in the last %d hours:\n' % age + body += '\n\n* Abandoned changes on master for project core changed in the last %d hours:\n\n' % age body += get_digest(gerrit, get_daily_query('abandoned', age)) - body += '\n\nOpen changes needing tweaks, but being untouched for more than a week:\n' + body += '\n\n* Open changes needing tweaks, but being untouched for more than a week:\n\end-daily-digest' body += get_digest(gerrit, 'project:core branch:master status:open (label:Code-Review<=-1 label:Verified<=-1) age:1w') body += ''' _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
