diff options
Diffstat (limited to 'rsync-gen.sh')
| -rwxr-xr-x | rsync-gen.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rsync-gen.sh b/rsync-gen.sh index 63701e7..82e72b9 100755 --- a/rsync-gen.sh +++ b/rsync-gen.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2005-2015 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 2005-2018 Gentoo Authors; Distributed under the GPL v2 # might be earlier copyright, no history available # 0) Make a backup incase there is something wrong with server side @@ -60,14 +60,14 @@ RSYNC_GIT_EXCLUDE="--include core/ --include '*.old' --cvs-exclude --exclude=.gi [[ -d ${LOGDIR} ]] || mkdir ${LOGDIR} [[ -d ${BASE}/tmp ]] || mkdir ${BASE}/tmp TIMESLOG="${LOGDIR}/rsync-gen-times.log" -for atomic_rsync in `which atomic-rsync 2>/dev/null` /usr/share/rsync/atomic-rsync MISSING ; do +for atomic_rsync in `command -v atomic-rsync 2>/dev/null` /usr/share/rsync/atomic-rsync MISSING ; do [ -x $atomic_rsync ] && break done if [ "$atomic_rsync" == "MISSING" ]; then echo "$0: Cannot do final atomic rsync into place, atomic-rsync tool is missing" exit 1 fi -for gemato in `which gemato 2>/dev/null` /usr/local/bin/gemato/bin/gemato MISSING ; do +for gemato in `command -v gemato 2>/dev/null` /usr/local/bin/gemato/bin/gemato MISSING ; do [ -x $gemato ] && break done if [ "$gemato " == "MISSING" ]; then @@ -125,6 +125,7 @@ fi timelog_start "STAGEDIR_repo_gentoo RSYNC" | timelogger rsync -Wqa --checksum --no-times \ $RSYNC_GIT_EXCLUDE \ + --filter 'R /metadata/install-qa-check.d/*' \ --filter 'P /metadata/***' \ --delete --delete-excluded \ ${EXPORTS}/gentoo-x86/ ${STAGEDIR_repo_gentoo}/ || exit @@ -133,7 +134,7 @@ timelog___end "STAGEDIR_repo_gentoo RSYNC" | timelogger # metadata tree is protected, so we need to repeat potentially-stale # Manifests separately (I couldn't get any R-rules to work) -find "${STAGEDIR_repo_gentoo}"/ '(' \ +find "${STAGEDIR_repo_gentoo}"/metadata '(' \ -name 'Manifest' -o -name 'Manifest.gz' -o -name 'Manifest.files.gz' \ ')' -delete |