[Blends-commit] [SCM] website branch, master, updated. 7a27e2fe5b5064c85a83004ff191d9a8d53856a0

[Andreas Tille]

The following commit has been merged in the master branch:
commit 6ae0ae0de6f38bd2e9dc8cb9e75512ac08e16cd8
Author: Andreas Tille <tille at debian.org>
Date:   Sat Aug 5 02:49:07 2017 +0200

    Fix reading changelog

diff --git a/misc/team_analysis_tools/count-dependencies.py b/misc/team_analysis_tools/count-dependencies.py
index e7805f7..a7a3c73 100755
--- a/misc/team_analysis_tools/count-dependencies.py
+++ b/misc/team_analysis_tools/count-dependencies.py
@@ -50,7 +50,10 @@ def TasksGetDrawList(tasks, checklist, avoidlist):
     min2draw = 100
     drawlist = []
     for t in checklist:
-        print(t, task_last.nrecommended[t])
+        try:
+            print(t, task_last.nrecommended[t])
+        except KeyError, err:
+            continue
         if task_last.nrecommended[t] < min2draw:
             min2draw = task_last.nrecommended[t]
     for r in list(task_last.recommends.keys()):
@@ -170,30 +173,27 @@ def main():
         match = changelog_entry_start_re.match(line)
         if match:
             chversion = match.groups()[0]
+            ignore=False
         else:
             match = changelog_entry_UNRELEASED_re.match(line)
-            ignore=True
-            continue
+            if match:
+                ignore=True
+                continue
         match = changelog_entry_end_re.match(line)
         if match:
             if ignore:
                 ignore=False
                 continue
             chdate = DateFrom(match.groups()[0])
-            try:
-                if chversion in dversions:
-                    task = taskscontent(BLEND, chversion, chdate)
-                    tasks[task.datekey] = task
-                    # print(chversion, task.datekey)
-                    dversions[chversion]['datekey'] = task.datekey
-                    jfp=open(root+'/'+dversions[chversion]['jsondata'])
-                    depdata=json.loads(jfp.read())
-                    jfp.close()
-                    dversions[chversion]['depdata'] = depdata
-            except UnboundLocalError, err:
-                print("Error while parsing changelog line \n   %s" % line)
-                print(err)
-                exit(1)
+            if chversion in dversions:
+                task = taskscontent(BLEND, chversion, chdate)
+                tasks[task.datekey] = task
+                dversions[chversion]['datekey'] = task.datekey
+                jfp=open(root+'/'+dversions[chversion]['jsondata'])
+                depdata=json.loads(jfp.read())
+                jfp.close()
+                # print(chversion, task.datekey, depdata)
+                dversions[chversion]['depdata'] = depdata
 
 #    print(dversions)
 

-- 
Static and dynamic websites for Debian Pure Blends