[Git][ftp-team/dak][master] 4 commits: Prevent removal of options line.

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

• 306c6863
  by Michael Lustfield at 2020-04-09T05:53:14-05:00

  Prevent removal of options line.
  
  This adds a newline to the end of the input prompt which prevents the
  destruction of text displayed within prompts when the window is resized.
  
  Signed-off-by: Michael Lustfield <michael@lustfield.net>
  

• 00928ad1
  by Ansgar at 2020-04-09T15:09:45+02:00

  config: `ldap.initialize` in Debian 10 (buster) wants the protocol as well
  

• b24c2e80
  by Ansgar at 2020-04-09T15:10:52+02:00

  Merge remote-tracking branch 'origin/merge-requests/172'
  

• ae84fa56
  by Ansgar at 2020-04-09T15:16:24+02:00

  config: stop using deprecated `GZIP` environment variable
  

5 changed files:

• config/common/variables
• config/debian-security/dak.conf
• config/debian/dak.conf
• config/debian/dinstall.functions
• daklib/utils.py

Changes:

config/common/variables

---

...	...	@@ -2,7 +2,6 @@
2	2
3	3	umask 022
4	4	unset CDPATH
5		-GZIP='--rsyncable --no-name' ; export GZIP
6	5
7	6	export lockdir=${lockdir:-${base}/lock/}
8	7	export logdir=${logdir:-${base}/log/cron/}

config/debian-security/dak.conf

---

...	...	@@ -65,7 +65,7 @@ Queue-Report
65	65	Import-LDAP-Fingerprints
66	66	{
67	67	LDAPDn "ou=users,dc=debian,dc=org";
68		- LDAPServer "db.debian.org";
	68	+ LDAPServer "ldap://db.debian.org";
69	69	CACertFile "/etc/ssl/ca-debian/ca-certificates.crt";
70	70	ExtraKeyrings
71	71	{

config/debian/dak.conf

---

...	...	@@ -100,7 +100,7 @@ Rm
100	100	Import-LDAP-Fingerprints
101	101	{
102	102	LDAPDn "ou=users,dc=debian,dc=org";
103		- LDAPServer "db.debian.org";
	103	+ LDAPServer "ldap://db.debian.org";
104	104	CACertFile "/etc/ssl/ca-debian/ca-certificates.crt";
105	105	ExtraKeyrings
106	106	{

config/debian/dinstall.functions

---

...	...	@@ -264,7 +264,7 @@ function mkfilesindices() {
264	264	cd $base/ftp
265	265	find ./dists -maxdepth 1 \! -type d
266	266	find ./dists \! -type d | grep "/source/"
267		- ) | sort -u | gzip -9 > source.list.gz
	267	+ ) | sort -u | gzip -9 --rsyncable --no-name > source.list.gz
268	268
269	269	log "Generating arch lists"
270	270
...	...	@@ -276,7 +276,7 @@ function mkfilesindices() {
276	276	cd $base/ftp
277	277	find ./dists -maxdepth 1 \! -type d
278	278	find ./dists \! -type d | grep -E "(proposed-updates.*_$a.changes$|/main/disks-$a/|/main/installer-$a/|/Contents-$a|/binary-$a/)"
279		- ) | sort -u | gzip -9 > arch-$a.list.gz
	279	+ ) | sort -u | gzip -9 --rsyncable --no-name > arch-$a.list.gz
280	280	done
281	281
282	282	log "Generating suite lists"
...	...	@@ -333,7 +333,7 @@ function mkfilesindices() {
333	333	done
334	334	)
335	335	suite_list $id
336		- ) | sort -u | gzip -9 > suite-${suite}.list.gz
	336	+ ) | sort -u | gzip -9 --rsyncable --no-name > suite-${suite}.list.gz
337	337	done
338	338
339	339	log "Finding everything on the ftp site to generate sundries"
...	...	@@ -358,7 +358,7 @@ function mkfilesindices() {
358	358
359	359	(cd $base/ftp/
360	360	for dist in sid $OLDOLDSTABLE $OLDSTABLE $STABLE $TESTING; do
361		- find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz
	361	+ find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 --rsyncable --no-name > $base/ftp/indices/files/components/translation-$dist.list.gz
362	362	done
363	363	)
364	364
...	...	@@ -385,8 +385,8 @@ function mkchecksums() {
385	385	# create an empty file for now.
386	386	# Maybe we should just drop md5sums...
387	387	#${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
388		- #${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz
389		- < /dev/null gzip -9 --no-name --rsyncable > ${md5list}.gz
	388	+ #${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9 --rsyncable --no-name > ${md5list}.gz
	389	+ < /dev/null gzip -9 --rsyncable --no-name > ${md5list}.gz
390	390	done
391	391	}
392	392

daklib/utils.py

---

...	...	@@ -79,7 +79,7 @@ def html_escape(s):
79	79
80	80	def our_raw_input(prompt=""):
81	81	if prompt:
82		- print(prompt, end='')
	82	+ print(prompt)
83	83	# TODO: py3: use `print(..., flush=True)`
84	84	sys.stdout.flush()
85	85	try:

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