diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-06-22 17:07:47 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-06-22 19:04:08 +0100 |
| commit | 0e66721f92075fdd312de17531c6c9175c674ed3 (patch) | |
| tree | 00233df9f1de8ac9afc7e17c426e01739b65bec4 | |
| parent | 375416205ac9263c07b615d5ee7aa374b263a9e7 (diff) | |
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>
| -rwxr-xr-x | infra/dgit-mirror-ssh-wrap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/infra/dgit-mirror-ssh-wrap b/infra/dgit-mirror-ssh-wrap index 4ce4e24..7f55fea 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 |