[Blends-commit] [SCM] website branch, master, updated. 5693e6046ee151a3b5ca2db8712d1c999ba986f0

[Ole Streicher]

The following commit has been merged in the master branch:
commit 5693e6046ee151a3b5ca2db8712d1c999ba986f0
Author: Ole Streicher <ole at aip.de>
Date:   Tue Mar 15 14:12:12 2016 +0100

    Another replacement short/long --> shortDesc/longDesc

diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index c153b02..88e40c3 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -1225,9 +1225,9 @@ class TaskDependencies:
                 logger.info("Edam topics found for package %s: %s" % (dep.pkg, str(row['edam_topics'])))
 
             if row.get('remark'):
-                (short, long) = SplitDescription(row['remark'])
-                dep.remark['short'] = Markup(short)
-                dep.remark['long']  = Markup(long)
+                (shortDesc, longDesc) = SplitDescription(row['remark'])
+                dep.remark['short'] = Markup(shortDesc)
+                dep.remark['long']  = Markup(longDesc)
 
             # Publications
             dep.SetPublications(row)
@@ -1246,10 +1246,10 @@ class TaskDependencies:
         query = "SELECT DISTINCT title, description, long_description FROM blends_tasks WHERE task='%s' AND blend='%s'" % (self.task, self.blendname)
         _execute_udd_query(query)
         if curs.rowcount > 0:
-            self.metapkg.PrintedName, short, long = curs.fetchone()
+            self.metapkg.PrintedName, shortDesc, longDesc = curs.fetchone()
             # Markup strings to enable verbatim output of preformatted text
-            self.metapkg.desc['en']['short'] = Markup(short)
-            self.metapkg.desc['en']['long']  = Markup(long)
+            self.metapkg.desc['en']['short'] = Markup(shortDesc)
+            self.metapkg.desc['en']['long']  = Markup(longDesc)
 
 
         # Get the package_name, license, dependency of the official dependencies of the task

-- 
Static and dynamic websites for Debian Pure Blends