[Git][ftp-team/dak][master] 4 commits: Fix typo in the usage of `dak import-repository`

["Ansgar (@ansgar)" <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• 2ddff79f
  by Youngtaek Yoon at 2021-06-21T05:08:12+00:00

  Fix typo in the usage of `dak import-repository`
  

• c672d242
  by Youngtaek Yoon at 2021-06-22T03:09:25+00:00

  Open a local file as binary mode
  
  The default mode is 'rt', which leads `copyfileobj()` to failure.
  

• e30b2557
  by Akshay S Dinesh at 2021-07-23T07:38:10+00:00

  Document py3 dependencies
  
  
  See https://salsa.debian.org/fasttrack-team/support/-/issues/18#note_248552

• aeede9ad
  by Ansgar at 2021-08-13T18:28:17+02:00

  Merge remote-tracking branches 'origin/merge-requests/248' and 'origin/merge-requests/249'
  

3 changed files:

• dak/import_repository.py
• daklib/import_repository.py
• setup/README.rst

Changes:

dak/import_repository.py

---

...	...	@@ -31,7 +31,7 @@ from collections import defaultdict
31	31	def usage(status=0):
32	32	print("""
33	33	dak import-repository
34		- --keyring=/usr/share/keyring/debian-archive-keyring.gpg
	34	+ --keyring=/usr/share/keyrings/debian-archive-keyring.gpg
35	35	[--key=${fingerprint}]
36	36	[--architectures=a,b,c (default: architectures in origin suite)]
37	37	[--components=main,contrib (default: components in origin suite)]

daklib/import_repository.py

---

...	...	@@ -97,7 +97,7 @@ def obtain_file(base, path):
97	97	shutil.copyfileobj(fh, tmp._tmp)
98	98	fh.close()
99	99	else:
100		- with open(fn, 'r') as fh:
	100	+ with open(fn, 'rb') as fh:
101	101	shutil.copyfileobj(fh, tmp._tmp)
102	102	return tmp
103	103

setup/README.rst

---

...	...	@@ -13,9 +13,9 @@ The following packages are needed for the database::
13	13
14	14	and the following packages for dak itself::
15	15
16		- python-psycopg2 python-sqlalchemy python-apt gnupg dpkg-dev lintian
17		- binutils-multiarch python-yaml less python-ldap python-pyrss2gen python-rrdtool
18		- symlinks python-debian python-debianbts
	16	+ python3-psycopg2 python3-sqlalchemy python3-apt gnupg dpkg-dev lintian
	17	+ binutils-multiarch python3-yaml less python3-ldap python3-pyrss2gen python3-rrdtool
	18	+ symlinks python3-debian python3-debianbts python3-tabulate
19	19
20	20	(the schema assumes at least postgresql 9.1; ftpmaster in Debian currently uses
21	21	the postgresql 9.6 version from Debian 9)

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