[Git][ftp-team/dak][master] 2 commits: [py3] daklib/checks.py: convert output from `lintian` to text

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

be321823

by Ansgar at 2020-10-31T09:38:36+01:00

[py3] daklib/checks.py: convert output from `lintian` to text

This can be changed to just use `text=True` in Python 3's `subprocess`
module later, but Python 2 does not have that.

Closes: #973470

f3005cca

by Ansgar at 2020-10-31T09:51:12+01:00

integration-tests: add "lintian.tags" to Debian-like archive tests

2 changed files:

daklib/checks.py
integration-tests/dinstall

Changes:

daklib/checks.py

@@ -921,10 +921,10 @@ class LintianCheck(Check):
                  cmd.extend(['sudo', '-H', '-u', user])
              cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
 -            output = daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT)
 +            output = six.ensure_text(daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT))
          except subprocess.CalledProcessError as e:
              result = e.returncode
 -            output = e.output
 +            output = six.ensure_text(e.output)
          finally:
              os.unlink(temp_filename)

integration-tests/dinstall

@@ -99,6 +99,17 @@ setup_debian_like_archive() {
      dak admin v-c add testing-proposed-updates MustBeNewerThan testing
      # unstable
      dak admin v-c add unstable MustBeNewerThan testing
++
 +    # Lintian check
 +    cat > ${DAKBASE}/etc/lintian.tags <<-EOF
 +	lintian:
 +	  nonfatal:
 +	    - wrong-file-owner-uid-or-gid
 +	  fatal:
 +	    - binary-in-etc
 +	EOF
++
 +    echo "Dinstall::LintianTags \"${DAKBASE}/etc/lintian.tags\";" >> ${DAKBASE}/etc/dak.conf
+ }
  upload_changes() {