[Blends-commit] r3593 - /blends/trunk/team_analysis_tools/count-dependencies.py

[tille at users.alioth.debian.org]

Author: tille
Date: Wed Oct 24 14:34:38 2012
New Revision: 3593

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3593
Log:
Make sure we will not move broken code to Git: Counting Recommends in past tags in SVN works correctly now, needs to be adapted to Git once w might move single projects to Git

Modified:
    blends/trunk/team_analysis_tools/count-dependencies.py

Modified: blends/trunk/team_analysis_tools/count-dependencies.py
URL: http://svn.debian.org/wsvn/blends/blends/trunk/team_analysis_tools/count-dependencies.py?rev=3593&op=diff
==============================================================================
--- blends/trunk/team_analysis_tools/count-dependencies.py (original)
+++ blends/trunk/team_analysis_tools/count-dependencies.py Wed Oct 24 14:34:38 2012
@@ -36,7 +36,7 @@
 	    r = r.strip()
 	    # since we also need to investigate "Depends" for older metapackages we also
 	    # need to exclude the extra control packages
-	    if r == BLEND+'-common' or r == BLEND+'-config' or r == BLEND+'-tasks':
+	    if r.startswith(BLEND+'-common') or r.startswith(BLEND+'-config') or r.startswith(BLEND+'-tasks'):
 		continue
 	    self.recommends[p].append(r)
 
@@ -83,12 +83,12 @@
 	  while pkg:
             if pkg.has_key('package'):
                 package = pkg['package']
-                if package != BLEND+'-common':
+                if package != BLEND+'-common' and package != BLEND+'-tasks':
                     if pkg.has_key('recommends'):
     	                recommends = pkg['recommends']
     	                task.add_recommends(package,recommends)
     	            # in previous package versions we use Depends rather then Recommends
-    	            if pkg.has_key('depends'):
+    	            elif pkg.has_key('depends'):
     	                depends = pkg['depends']
     	                task.add_recommends(package,depends)
     	        try: