Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
b9f1400a
by Ivo De Decker at 2020-05-21T19:22:33+00:00
-
bd269320
by Ivo De Decker at 2020-05-21T19:22:33+00:00
-
052fd1b3
by Ivo De Decker at 2020-05-21T20:34:08+00:00
6 changed files:
- dak/examine_package.py
- integration-tests/dak-coverage.sh
- + tests/fixtures/packages/grave-0.1/debian/README.source
- + tests/fixtures/packages/grave-0.1/debian/copyright
- + tests/fixtures/packages/snowman-0.1/debian/README.source
- + tests/fixtures/packages/snowman-0.1/debian/copyright
Changes:
| ... | ... | @@ -161,6 +161,7 @@ def escaped_text(s, strip=False): |
| 161 | 161 |
|
| 162 | 162 |
|
| 163 | 163 |
def formatted_text(s, strip=False):
|
| 164 |
+ s = six.ensure_str(s)
|
|
| 164 | 165 |
if use_html:
|
| 165 | 166 |
if strip:
|
| 166 | 167 |
s = s.strip()
|
| ... | ... | @@ -177,6 +178,8 @@ def output_row(s): |
| 177 | 178 |
|
| 178 | 179 |
|
| 179 | 180 |
def format_field(k, v):
|
| 181 |
+ k = six.ensure_str(k)
|
|
| 182 |
+ v = six.ensure_str(v)
|
|
| 180 | 183 |
if use_html:
|
| 181 | 184 |
return """<tr><td class="key">%s:</td><td class="val">%s</td></tr>""" % (k, v)
|
| 182 | 185 |
else:
|
| ... | ... | @@ -198,7 +201,7 @@ def foldable_output(title, elementnameprefix, content, norow=False): |
| 198 | 201 |
result += output_row(content) + "\n"
|
| 199 | 202 |
if use_html:
|
| 200 | 203 |
result += """</tbody></table></div>"""
|
| 201 |
- return result
|
|
| 204 |
+ return six.ensure_str(result)
|
|
| 202 | 205 |
|
| 203 | 206 |
################################################################################
|
| 204 | 207 |
|
| ... | ... | @@ -595,10 +598,11 @@ def get_readme_source(dsc_filename): |
| 595 | 598 |
if e.errno != errno.EACCES:
|
| 596 | 599 |
res += "%s: couldn't remove tmp dir %s for source tree." % (dsc_filename, tempdir)
|
| 597 | 600 |
|
| 598 |
- return res
|
|
| 601 |
+ return six.ensure_str(res)
|
|
| 599 | 602 |
|
| 600 | 603 |
|
| 601 | 604 |
def check_dsc(suite, dsc_filename, session=None):
|
| 605 |
+ dsc_filename = six.ensure_str(dsc_filename)
|
|
| 602 | 606 |
dsc = read_changes_or_dsc(suite, dsc_filename, session)
|
| 603 | 607 |
dsc_basename = os.path.basename(dsc_filename)
|
| 604 | 608 |
cdsc = foldable_output(dsc_filename, "dsc", dsc, norow=True) + \
|
| ... | ... | @@ -13,5 +13,5 @@ if [ "$RUN_COVERAGE" = "y" ] |
| 13 | 13 |
then
|
| 14 | 14 |
exec python-coverage run --rcfile "${DAK_ROOT}/.coveragerc" --source "${DAK_ROOT}" --parallel-mode "${DAK_ROOT}/dak/dak.py" "$@"
|
| 15 | 15 |
else
|
| 16 |
- exec "${DAK_ROOT}/dak/dak.py" "$@"
|
|
| 16 |
+ exec python "${DAK_ROOT}/dak/dak.py" "$@"
|
|
| 17 | 17 |
fi
|
| 1 |
+This is è package.
|
| 1 |
+This is a package by Développeur <developpeur@example.com>
|
| 1 |
+This is a ☃ package.
|
| 1 |
+This is a package by Snowman ☃ <snowman@example.com>
|