On Tuesday, August 18 2020, Sean Whitton wrote: > Hello, > > On Tue 18 Aug 2020 at 04:51PM -04, Sergio Durigan Junior wrote: > >> diff -Nru dgit-9.11/infra/dgit-mirror-ssh-wrap >> dgit-9.12~/infra/dgit-mirror-ssh-wrap >> --- dgit-9.11/infra/dgit-mirror-ssh-wrap 2020-06-22 14:09:17.000000000 >> -0400 >> +++ dgit-9.12~/infra/dgit-mirror-ssh-wrap 2020-08-18 16:19:08.000000000 >> -0400 >> @@ -29,6 +29,8 @@ >> m{^rsync --server -lHtre\.iLsfxC --timeout=\d+ --delete --safe-links \. $d$} >> || >> m{^rsync --server -lHtre\.iLsfxCIv --timeout=\d+ --delete --safe-links \. >> $d$} >> +|| >> +m{^rsync --server -lHtre\.iLsfxCIvu --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 > > Hmm, unlike the -I and -v options, the -u option seems like it could > break things. Could you explain why you think it won't, please?
Thanks for looking into this. First of all, I think it's worth noting that this change comes from rsync. The purpose of the patch I submitted is merely to adjust dgit-mirror-ssh-wrapper to accept rsync's new "eFlags" markers, and not actually to invoke rsync with '-u'. You can see the specific upstream change here: https://git.samba.org/?p=rsync.git;a=commitdiff;h=bb16db174;hp=d6f0342a344f4718beae65a5a68d19b2751e5f6a More specifically, this part: + eFlags[x++] = 'u'; /* include name of uid 0 & gid 0 in the id map */ which is what caused the change that eventually broke dgit-mirror-ssh-wrapper. Now, it's interesting to note that the 'u' here does not reflect the client's '-u' option. I don't know how the inclusion of "uid/gid 0 in the id map" can break things, but maybe I'm overlooking something. However, if we indeed agree that things can break here, then it seems to me that a new bug should be filed against rsync, IMO. Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible https://sergiodj.net/
signature.asc
Description: PGP signature