[Git][ftp-team/dak][master] 2 commits: process-new: write temporary file for editing overrides in text mode

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• 49829c00
  by Ansgar at 2020-10-31T14:36:03+01:00

  process-new: write temporary file for editing overrides in text mode
  
  This pleases Python 3.
  

• eedd68dd
  by Ansgar at 2020-10-31T14:42:02+01:00

  LintianCheck: fix indent
  
  Regression introduced in ada1bc53bd547df4400393195c9a1facde9cc548.
  

2 changed files:

• dak/process_new.py
• daklib/checks.py

Changes:

dak/process_new.py

---

...	...	@@ -202,7 +202,7 @@ def index_range(index):
202	202
203	203
204	204	def edit_new(overrides, upload, session):
205		- with tempfile.NamedTemporaryFile() as fh:
	205	+ with tempfile.NamedTemporaryFile(mode="w+t") as fh:
206	206	# Write the current data to a temporary file
207	207	print_new(upload, overrides, indexed=0, session=session, file=fh)
208	208	fh.flush()

daklib/checks.py

---

...	...	@@ -888,8 +888,8 @@ class LintianCheck(Check):
888	888	if user is not None:
889	889	cmd.extend(['sudo', '-H', '-u', user])
890	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))
	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	893	except subprocess.CalledProcessError as e:
894	894	result = e.returncode
895	895	output = six.ensure_text(e.output)

—
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.