[Git][ftp-team/dak][deploy] 2 commits: stretch's timeout is too old for --verbose

[Ansgar <ansgar@debian.org>]

Title: GitLab

Ansgar pushed to branch deploy at Debian FTP Team / dak

Commits:

• 21260c65
  by Ansgar Burchardt at 2019-07-17T17:57:54Z

  stretch's timeout is too old for --verbose
  

• 161e0b87
  by Ansgar Burchardt at 2019-07-17T18:00:00Z

  Merge branch 'master' into deploy
  

1 changed file:

• scripts/debian/sync-dd

Changes:

scripts/debian/sync-dd

---

...	...	@@ -63,7 +63,7 @@ trap cleanup EXIT TERM HUP INT QUIT
63	63	if lockfile -r3 "${lockfile}" 2> /dev/null; then
64	64	case "${mode}" in
65	65	sync)
66		- timeout --verbose "${timeout}" \
	66	+ timeout "${timeout}" \
67	67	rsync -aH -B8192 \
68	68	${extra1} \
69	69	--exclude "/.nobackup" \
...	...	@@ -92,7 +92,7 @@ if lockfile -r3 "${lockfile}" 2> /dev/null; then
92	92	# command for the remote side:
93	93	# command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp-master.debian.org/"
94	94
95		- timeout --verbose "${timeout}" \
	95	+ timeout "${timeout}" \
96	96	rsync -aH -B8192 \
97	97	--exclude "/.nobackup" \
98	98	--exclude mirror \
...	...	@@ -107,7 +107,7 @@ if lockfile -r3 "${lockfile}" 2> /dev/null; then
107	107	# command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp.debian.org/"
108	108	;;
109	109	code)
110		- timeout --verbose "${timeout}" \
	110	+ timeout "${timeout}" \
111	111	rsync -aH -B8192 \
112	112	--exclude "/.nobackup" \
113	113	--delete --delete-after \

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