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

[Andreas Tille]

The following commit has been merged in the master branch:
commit e346205bb0e5a5f8fd9713c50ca969a0097faa0e
Author: Andreas Tille <tille at debian.org>
Date:   Sat Aug 5 00:05:20 2017 +0200

    Ignore UNRELEASED

diff --git a/misc/team_analysis_tools/count-dependencies.py b/misc/team_analysis_tools/count-dependencies.py
index 974c637..e7805f7 100755
--- a/misc/team_analysis_tools/count-dependencies.py
+++ b/misc/team_analysis_tools/count-dependencies.py
@@ -36,6 +36,7 @@ SUPPRESSTASKS = { 'med': [ 'cloud', 'bio-ngs', 'bio-phylogeny' ],
                 }
 
 changelog_entry_start_re = re.compile('^[^\s]+ \((\d.+)\) unstable; urgency=')
+changelog_entry_UNRELEASED_re = re.compile('^[^\s]+ \((\d.+)\) UNRELEASED; urgency=')
 changelog_entry_end_re   = re.compile('^ -- .* <.*@.*>  (.*)$')
 
 def TasksGetDrawList(tasks, checklist, avoidlist):
@@ -164,22 +165,35 @@ def main():
 #    for stanza in deb822.Sources.iter_paragraphs(f):
 #        print(stanza.keys()) # does not provide sensible keys ...
 
+    ignore=False
     for line in f.readlines():
         match = changelog_entry_start_re.match(line)
         if match:
             chversion = match.groups()[0]
+        else:
+            match = changelog_entry_UNRELEASED_re.match(line)
+            ignore=True
+            continue
         match = changelog_entry_end_re.match(line)
         if match:
+            if ignore:
+                ignore=False
+                continue
             chdate = DateFrom(match.groups()[0])
-            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
+            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)
 
 #    print(dversions)
 

-- 
Static and dynamic websites for Debian Pure Blends