[Blends-commit] [SCM] website branch, master, updated. 73b89a59bdce425622aaab012849a42ff66aa9d1

[Andreas Tille]

The following commit has been merged in the master branch:
commit 73b89a59bdce425622aaab012849a42ff66aa9d1
Author: Andreas Tille <tille at debian.org>
Date:   Thu Feb 13 16:12:28 2014 +0100

    DebiChem has also Git repository; pkg-java is featuring some scientific packages as well

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index fa18f66..c27b493 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -20,11 +20,13 @@ SVNDIRS="debian-med/trunk/packages
          debichem/experimental
          pkg-games/packages
          pkg-grass/packages
+         pkg-java
          pkg-multimedia/unstable
          demudi"
 
 GITDIRS="debian-med
          debian-science/packages
+         debichem/packages
          pkg-a11y
          pkg-scicomp
          pkg-exppsy
diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index c5c6799..0b38ac3 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -17,6 +17,24 @@ if psql -l 2>/dev/null | grep -qw udd ; then
     SERVICE=udd
 fi
 
+case "$1" in
+    debian-science)
+        team="'debian-science-maintainers at lists.alioth.debian.org','pkg-scicomp-devel at lists.alioth.debian.org'"
+        ;;
+    debian-med)
+        team="'debian-med-packaging at lists.alioth.debian.org'"
+        ;;
+    debian-gis)
+        team="'pkg-grass-devel at lists.alioth.debian.org','pkg-osm-maint at lists.alioth.debian.org'"
+        ignore="''"
+        ;;
+    *)
+        echo "Unsupported Blend $1"
+#        exit 1
+        ;;
+esac
+
+
 psql $SERVICE >$1.out <<EOT
 SELECT b.source,
        stable.version AS stable,
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index c58ef80..0178af8 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -843,6 +843,7 @@ class DependantPackage:
                         else:
                             logger.debug("Author string changed in %s: '%s' -> '%s'", self.pkg, to_unicode(row[pub]), to_unicode(authors_string))
                             row[pub] = authors_string
+                        print "DEBUG1", row[pub]
                 if not self.properties.has_key('published'):
                     self.properties['published'] = {}
                 if self.properties['published'].has_key(pub):
@@ -855,6 +856,9 @@ class DependantPackage:
             	    else:
             	        logger.info("%s conflicting fields Publication-%s in tasks file with value '%s' and in UDD with value '%s'" % (self.pkg, pub, self.properties['published'][pub], to_unicode(row[pub])))
                 self.properties['published'][pub] = to_unicode(row[pub])
+	print "DEBUG2", row['authors']
+##	if self.properties.has_key['published']:
+##FIXME	    print "DEBUG2a", self.properties['published']['authors']
 
 class Tasks:
     # Provide a list of depencencies defined in metapackages
@@ -1655,6 +1659,11 @@ class TaskDependencies:
                 # package versions in all releases
                 dep.properties['pkg-url'] = PKGURLMASK % dep.pkg
                 dep.SetPublications(row)
+		if dep.properties.has_key('published'):
+                    try:
+                    	print "DEBUG3a", dep.properties['published']['authors']
+		    except UnicodeEncodeError, err:
+			print "DEBUG3aX", str(row['authors']), "\n", err
                 for l in languages:
                     if row['description_'+l]:
                         dep.desc[l] = {}
@@ -1716,6 +1725,7 @@ class TaskDependencies:
                 (_name, _url) = email.Utils.parseaddr(row['maintainer'])
                 dep.responsible = '<a href="mailto:%s">%s</a>' % (_url, to_unicode(_name))
                 dep.SetPublications(row)
+                print "DEBUG3b", dep.properties['published']['authors']
                 if row['changed_by']:
                     try:
                         changed = to_unicode(row['changed_by'])
@@ -1797,6 +1807,7 @@ class TaskDependencies:
                 if int(row['wnpp']) > 0:
                     dep.properties['wnpp'] = row['wnpp']
                 dep.SetPublications(row)
+                print "DEBUG3c", dep.properties['published']['authors']
                 dep.desc['en']['short'] = MarkupString(to_unicode(row['description_en']), dep.pkg, 'ShortDesc - New')
                 dep.desc['en']['long']  = Markup(render_longdesc(row['long_description_en'].splitlines()))
                 (_name, _url) = email.Utils.parseaddr(row['maintainer'])
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 5260d69..c654543 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -238,6 +238,20 @@ the right shows the tasks of %s.""" ) \
 		f = open(outputfile+'_tmp', "w")
 		try:
 			print >> f, template.generate(**data).render('xhtml')
+		except UnicodeEncodeError, errtxt:
+			print "Some critical encoding problem occured when trying to render task %s for lang %s.\n%s" \
+			      % (task, lang, errtxt)
+			for dt in data['tasks'].keys():
+				dpl = data['tasks'][dt].dependencies['official_high']
+				for dp in dpl:
+					if dp.taskname == task:
+						print "%s / %s: %s" % (task, lang, dp.desc[lang])
+						if dp.properties.has_key('published'):
+							try:
+								print "\tpublished-authors: %s" % ( to_unicode(dp.properties['published']['authors']) )
+							except UnicodeEncodeError, err:
+								print err, " [starts with >>%s<<]" % to_unicode(dp.properties['published']['authors'][0:10])
+						print "\n"
 		except UnicodeDecodeError, errtxt:
 			print >> stderr, \
                              "Some critical encoding problem occured when trying to render task %s for lang %s.\n%s" \

-- 
Static and dynamic websites for Debian Pure Blends