From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Jun 2020 16:07:47 +0000 (+0100)
Subject: dgit-mirror-ssh-wrap: Cope with new rsync rune
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0e66721f92075fdd312de17531c6c9175c674ed3

dgit-mirror-ssh-wrap: Cope with new rsync rune

rsync 3.2 passes -I and -v to the remote process.  These options are
no problem.

Rather than making this into an single mess of a regexp, add a new
regexp for the new rune.  That's clearer and I think probably just
about as future-proof.

Closes: #963489
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/infra/dgit-mirror-ssh-wrap b/infra/dgit-mirror-ssh-wrap
index 4ce4e245..7f55fead 100755
--- a/infra/dgit-mirror-ssh-wrap
+++ b/infra/dgit-mirror-ssh-wrap
@@ -27,6 +27,8 @@ my $command = $ENV{SSH_ORIGINAL_COMMAND}
 $_ = $command;
 
 m{^rsync --server -lHtre\.iLsfxC --timeout=\d+ --delete --safe-links \. $d$}
+||
+m{^rsync --server -lHtre\.iLsfxCIv --timeout=\d+ --delete --safe-links \. $d$}
 
 # To add a new command pattern, add || m{^ ... $} above.
 # The pattern should contain $d where the per-package destination