The following commit has been merged in the master branch:
commit 348a26b2727a836888fa56a20ddb0ee6f2e9b7c9
Author: Andreas Tille <[email protected]>
Date: Fri Aug 1 13:47:18 2014 +0200
Revert unintended commit of code from debugging branch
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 0178af8..c58ef80 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -843,7 +843,6 @@ 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):
@@ -856,9 +855,6 @@ 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
@@ -1659,11 +1655,6 @@ 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] = {}
@@ -1725,7 +1716,6 @@ 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'])
@@ -1807,7 +1797,6 @@ 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 c654543..adcd938 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -241,17 +241,6 @@ the right shows the tasks of %s.""" ) \
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
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
