[Git][ftp-team/dak][master] LintianCheck: use `Popen` instead of `check_output`

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• 2eb23bf9
  by Ansgar at 2020-10-31T14:53:17+01:00

  LintianCheck: use `Popen` instead of `check_output`
  
  We do not need to throw/catch an exception this way; after all we
  handle all return codes from lintian the same.
  
  This also reduces the indent level by one.
  

1 changed file:

• daklib/checks.py

Changes:

daklib/checks.py

---

...	...	@@ -880,19 +880,16 @@ class LintianCheck(Check):
880	880	temptagfile.flush()
881	881
882	882	changespath = os.path.join(upload.directory, changes.filename)
883		- try:
884		- cmd = []
885		- result = 0
886		-
887		- user = cnf.get('Dinstall::UnprivUser') or None
888		- if user is not None:
889		- cmd.extend(['sudo', '-H', '-u', user])
890		-
891		- cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temptagfile.name, changespath])
892		- output = six.ensure_text(daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT))
893		- except subprocess.CalledProcessError as e:
894		- result = e.returncode
895		- output = six.ensure_text(e.output)
	883	+
	884	+ cmd = []
	885	+ user = cnf.get('Dinstall::UnprivUser') or None
	886	+ if user is not None:
	887	+ cmd.extend(['sudo', '-H', '-u', user])
	888	+ cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temptagfile.name, changespath])
	889	+ process = daklib.daksubprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
	890	+ output_raw = process.communicate()[0]
	891	+ output = six.ensure_text(output_raw)
	892	+ result = process.returncode
896	893
897	894	if result == 2:
898	895	utils.warn("lintian failed for %s [return code: %s]." %

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.