[Blends-commit] [SCM] website branch, master, updated. 060905806fcefb5d226e520f94f3eb6f205522e2

[Ole Streicher]

The following commit has been merged in the master branch:
commit f338b7e946b3880ba58bcacc2b07372023bcc811
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Mar 8 23:06:54 2016 +0100

    Replace short, long (latter is hiding a type) with shortDesc, longDesc

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 8c37013..c32eb0d 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1247,10 +1247,10 @@ class TaskDependencies:
                     if found_description:
                         logger.error("Duplicate description entry in task %s; you probably want to use Pkg-Description field instead!" % self.task)
                     else:
-                        (short, long) = SplitDescription(stanza['description'])
+                        (shortDesc, longDesc) = SplitDescription(stanza['description'])
                         # Markup strings to enable verbatim output of preformatted text
-                        self.metapkg.desc['en']['short'] = MarkupString(short, self.metapkg.PrintedName, 'taskShortDesc')
-                        self.metapkg.desc['en']['long']  = MarkupString(long, self.metapkg.PrintedName, 'taskLongDesc')
+                        self.metapkg.desc['en']['short'] = MarkupString(shortDesc, self.metapkg.PrintedName, 'taskShortDesc')
+                        self.metapkg.desc['en']['long']  = MarkupString(longDesc, self.metapkg.PrintedName, 'taskLongDesc')
                         found_description = True
                     continue
                 if key == 'Meta-Depends':
@@ -1471,22 +1471,22 @@ class TaskDependencies:
                     else:
                         # Only update use description from task file if not known from official package
                         if dep.desc['en'] == {}:
-                            (short, long) = SplitDescription(stanza['pkg-description'])
-                            dep.desc['en']['short'] = short
-                            dep.desc['en']['long']  = long
+                            (shortDesc, longDesc) = SplitDescription(stanza['pkg-description'])
+                            dep.desc['en']['short'] = shortDesc
+                            dep.desc['en']['long']  = longDesc
                         else:
                             fields_obsolete.append(key)
                             continue
                 elif key == 'Avoid' or key == 'Ignore':
                     dep.pkgstatus = key.lower()
                 elif key == 'Remark':
-                    (short, long) = SplitDescription(stanza['remark'])
+                    (shortDesc, longDesc) = SplitDescription(stanza['remark'])
                     if dep is None:
                         _pkg = self.metapkg.PrintedName
                     else:
                         _pkg = dep.pkg
-                    remark['short'] = MarkupString(short, _pkg, 'RemarkShort')
-                    remark['long']  = MarkupString(long, _pkg, 'RemarkLong')
+                    remark['short'] = MarkupString(shortDesc, _pkg, 'RemarkShort')
+                    remark['long']  = MarkupString(longDesc, _pkg, 'RemarkLong')
                     continue
                 else:
                     if key not in KEYSTOIGNORE:

-- 
Static and dynamic websites for Debian Pure Blends