[med-svn] r1676 - trunk/community/infrastructure/scripts

[tille at alioth.debian.org]

Author: tille
Date: 2008-04-01 09:30:08 +0000 (Tue, 01 Apr 2008)
New Revision: 1676

Modified:
   trunk/community/infrastructure/scripts/cddtasktools.py
Log:
Fix Data dir for other CDDs than Debian-Med


Modified: trunk/community/infrastructure/scripts/cddtasktools.py
===================================================================
--- trunk/community/infrastructure/scripts/cddtasktools.py	2008-03-31 15:17:41 UTC (rev 1675)
+++ trunk/community/infrastructure/scripts/cddtasktools.py	2008-04-01 09:30:08 UTC (rev 1676)
@@ -32,6 +32,11 @@
              'debian-science' : SVNHOST+"/svn/cdd/projects/science/trunk/debian-science/tasks/",
            }
 HTMLBASE = "/var/lib/gforge/chroot/home/groups"
+DATADIR  = { 'debian-med'     : HTMLBASE+"/debian-med/data/",
+             'debian-edu'     : HTMLBASE+"/cdd/data/edu/",
+             'debian-gis'     : HTMLBASE+"/cdd/data/gis/",
+             'debian-science' : HTMLBASE+"/cdd/data/science/",
+           }
 KEYSTOIGNORE = ( 'Architecture', 'Leaf', 'NeedConfig', 'Note', 'Section' )
 GLOBALCACHE  = "/var/cache/cdd/"
 DDTPURL = "http://ddtp.debian.net/debian/dists/"
@@ -48,7 +53,12 @@
     # technology make sure to include the location in the
     # REPOS dictionary
     #
-    tasksdir = "%s/%s/data/tasks" % (HTMLBASE, cddname)
+    tasksdir = DATADIR[cddname] + 'tasks/'
+    if not os.access(tasksdir, os.W_OK):
+	try:
+		os.makedirs(tasksdir)
+	except:
+		print >> stderr, "Unable to create data directory", tasksdir
     # Checkout/Update tasks from SVN
     if os.path.isdir(tasksdir+'/.svn'):
         os.system("svn up %s %s >> /dev/null" % (REPOS[cddname], tasksdir))
@@ -393,7 +403,8 @@
                             if dep.dep_strength != 'Ignore' and dep.dep_strength != 'Avoid':
                                 self.dependencies[self._FindDependencyType(dep)].append(dep)
                             else:
-                                print "Package %s actively ignored / avoided." % dep.pkg
+                                # print "Package %s actively ignored / avoided." % dep.pkg
+                                pass
                         dep = DependantPackage(self.cddname, self.task)
                         # Store the comments in case they might be usefull for later applications
                         dep.why            = why
@@ -476,7 +487,8 @@
                 if dep.dep_strength != 'Ignore' and dep.dep_strength != 'Avoid':
                     self.dependencies[self._FindDependencyType(dep)].append(dep)
                 else:
-                    print "Package %s actively ignored / avoided." % dep.pkg
+                    # print "Package %s actively ignored / avoided." % dep.pkg
+                    pass
                 
         f.close()