Bladeren bron

Bugfix: copy-{to,from}-target: Strip trailing / from sources to avoid triggering special rsync behaviour

Without this, the caches end up in the wrong place (one level of directories gets removed)
pull/112/head
Luke Dashjr 5 jaren geleden
bovenliggende
commit
bf52af1377
2 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 2
    1
      libexec/copy-from-target
  2. 2
    1
      libexec/copy-to-target

+ 2
- 1
libexec/copy-from-target Bestand weergeven

@@ -47,7 +47,8 @@ if [ $# = 0 ] ; then
fi

if [ -z "$USE_LXC" ]; then
rsync --checksum -a $QUIET_FLAG -e "ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT" "$TUSER@localhost:$1" "$2"
src="${1%/}" # remove trailing / which triggers special rsync behaviour
rsync --checksum -a $QUIET_FLAG -e "ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT" "$TUSER@localhost:${src}" "$2"
else
config-lxc
sudo $LXC_EXECUTE -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C `dirname "$1"` -cf - `basename "$1"` | tar -C "$2" -xf -

+ 2
- 1
libexec/copy-to-target Bestand weergeven

@@ -47,7 +47,8 @@ if [ $# = 0 ] ; then
fi

if [ -z "$USE_LXC" ]; then
rsync --checksum -a $QUIET_FLAG -e "ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT" "$1" "$TUSER@localhost:$2"
src="${1%/}" # remove trailing / which triggers special rsync behaviour
rsync --checksum -a $QUIET_FLAG -e "ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_rsa -p $VM_SSH_PORT" "${src}" "$TUSER@localhost:$2"
else
config-lxc
tar -C `dirname "$1"` -cf - `basename "$1"` | sudo $LXC_EXECUTE -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf -

Laden…
Annuleren
Opslaan