Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
2 changed files:
Changes:
... | ... | @@ -921,10 +921,10 @@ class LintianCheck(Check): |
921 | 921 |
cmd.extend(['sudo', '-H', '-u', user])
|
922 | 922 |
|
923 | 923 |
cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
|
924 |
- output = daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT)
|
|
924 |
+ output = six.ensure_text(daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT))
|
|
925 | 925 |
except subprocess.CalledProcessError as e:
|
926 | 926 |
result = e.returncode
|
927 |
- output = e.output
|
|
927 |
+ output = six.ensure_text(e.output)
|
|
928 | 928 |
finally:
|
929 | 929 |
os.unlink(temp_filename)
|
930 | 930 |
|
... | ... | @@ -99,6 +99,17 @@ setup_debian_like_archive() { |
99 | 99 |
dak admin v-c add testing-proposed-updates MustBeNewerThan testing
|
100 | 100 |
# unstable
|
101 | 101 |
dak admin v-c add unstable MustBeNewerThan testing
|
102 |
+ |
|
103 |
+ # Lintian check
|
|
104 |
+ cat > ${DAKBASE}/etc/lintian.tags <<-EOF
|
|
105 |
+ lintian:
|
|
106 |
+ nonfatal:
|
|
107 |
+ - wrong-file-owner-uid-or-gid
|
|
108 |
+ fatal:
|
|
109 |
+ - binary-in-etc
|
|
110 |
+ EOF
|
|
111 |
+ |
|
112 |
+ echo "Dinstall::LintianTags \"${DAKBASE}/etc/lintian.tags\";" >> ${DAKBASE}/etc/dak.conf
|
|
102 | 113 |
}
|
103 | 114 |
|
104 | 115 |
upload_changes() {
|