[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-report.py

[jan Iversen]

 esc-reporting/esc-analyze.py |    2 +-
 esc-reporting/esc-report.py  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 652701353fe709be42430c33fa78d6ebd3fc610a
Author: jan Iversen <jani at documentfoundation.org>
Date:   Wed Dec 21 08:05:43 2016 +0100

    update for wrong licensing

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index b217bdb..22082f0 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -26,7 +26,7 @@
 #
 # dump/developers_dump.json is used to identify:
 #   new contributors
-#   contributors missing license
+#   contributors missing licensek
 #   contributor award scheme
 #   cross reference emails (several people uses multiple emails, there is a function to control that)
 #
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 095ffea..b5d02db 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -301,7 +301,7 @@ def report_mentoring():
 
     print("    + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report:", file=fp)
     for row in myStatList['award_1st_email']:
-        print('          ' + row['name'], file=fp)
+        print('          {} {} {}'.format(row['name'],row['email'],row['license']), file=fp)
     print("\n\n\n\n\n\n\n\n\n\n", file=fp)
     print('Day mentoring report, generated {} based on stats.json from {}'.format(
            datetime.datetime.now().strftime("%Y-%m-%d"), statList['addDate']), file=fp)
@@ -473,7 +473,7 @@ def runCfg(platform):
     cfg['platform'] = platform
     print("Reading and writing data to " + cfg['homedir'])
 
-    cfg['contributor'] = util_load_data_file(cfg['homedir'] + 'award.json')
+    cfg['award-mailed'] = util_load_data_file(cfg['homedir'] + 'award.json')['award-mailed']
     cfg['nowDate'] = datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
     cfg['cutDate'] = cfg['nowDate'] - datetime.timedelta(days=365)
     cfg['1weekDate'] = cfg['nowDate'] - datetime.timedelta(days=7)