[Git][ftp-team/dak][master] 2 commits: do_command: use Popen's `communicate` method

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• d78b275e
  by Ansgar at 2020-11-02T21:33:53+01:00

  do_command: use Popen's `communicate` method
  
  This also closes the stdout filedescriptor and simplifies the code a
  bit as the extra call to `wait()` is no longer needed.
  

• 0f3c92af
  by Ansgar at 2020-11-02T21:35:26+01:00

  process_keyring: close file after use
  
  Also use `os.fchmod` because we can ;-)
  

2 changed files:

• dak/examine_package.py
• dak/init_dirs.py

Changes:

dak/examine_package.py

---

...	...	@@ -491,15 +491,11 @@ def output_deb_info(suite, filename, packagename, session=None):
491	491
492	492	def do_command(command, escaped=False):
493	493	process = daklib.daksubprocess.Popen(command, stdout=subprocess.PIPE)
494		- o = process.stdout
495		- try:
496		- data = six.ensure_str(o.read())
497		- if escaped:
498		- return escaped_text(data)
499		- else:
500		- return formatted_text(data)
501		- finally:
502		- process.wait()
	494	+ data = six.ensure_str(process.communicate()[0])
	495	+ if escaped:
	496	+ return escaped_text(data)
	497	+ else:
	498	+ return formatted_text(data)
503	499
504	500
505	501	def do_lintian(filename):

dak/init_dirs.py

---

...	...	@@ -103,11 +103,11 @@ def process_keyring(fullpath, secret=False):
103	103
104	104	# Touch the file
105	105	print("Creating {} ...".format(fullpath))
106		- open(fullpath, 'w')
107		- if secret:
108		- os.chmod(fullpath, 0o600)
109		- else:
110		- os.chmod(fullpath, 0o644)
	106	+ with open(fullpath, 'w') as fh:
	107	+ if secret:
	108	+ os.fchmod(fh.fileno(), 0o600)
	109	+ else:
	110	+ os.fchmod(fh.fileno(), 0o644)
111	111
112	112	######################################################################
113	113

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