From e34de125f490a23dbc1a9ce7d4101d946fe93083 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 26 Apr 2013 14:34:12 +0200 Subject: [PATCH 1/1] Properly ignore commented out lines --- .../files/static-mirroring/static-master-update-component | 4 ++-- .../roles/files/static-mirroring/static-update-component | 8 ++++---- modules/roles/files/static-mirroring/staticsync-ssh-wrap | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component index e01c7343..64836ba2 100755 --- a/modules/roles/files/static-mirroring/static-master-update-component +++ b/modules/roles/files/static-mirroring/static-master-update-component @@ -81,8 +81,8 @@ if [ "${component%/*}" != "$component" ] ; then exit 1 fi -srchost="$(awk -v this_host="$(hostname -f)" -v component="$component" '$1 == this_host && $2 == component {print $3; exit}' "$componentlist")" -srcdir="$(awk -v this_host="$(hostname -f)" -v component="$component" '$1 == this_host && $2 == component {print $4; exit}' "$componentlist")" +srchost="$(awk -v this_host="$(hostname -f)" -v component="$component" '!/^ *(#|$)/ && $1 == this_host && $2 == component {print $3; exit}' "$componentlist")" +srcdir="$(awk -v this_host="$(hostname -f)" -v component="$component" '!/^ *(#|$)/ && $1 == this_host && $2 == component {print $4; exit}' "$componentlist")" if [ -z "$srchost" ] || [ -z "$srcdir" ]; then echo >&2 "$0: Invalid component: $component (not found in $componentlist)"; exit 1 diff --git a/modules/roles/files/static-mirroring/static-update-component b/modules/roles/files/static-mirroring/static-update-component index 2cae0b8b..27b9318e 100755 --- a/modules/roles/files/static-mirroring/static-update-component +++ b/modules/roles/files/static-mirroring/static-update-component @@ -41,12 +41,12 @@ if [ "${component%/*}" != "$component" ] ; then fi thishost=$(hostname -f) -masterhost="$(awk -v component="$component" '$2 == component {print $1; exit}' "$componentlist")" -srchost="$(awk -v component="$component" '$2 == component {print $3; exit}' "$componentlist")" -srcdir="$(awk -v component="$component" '$2 == component {print $4; exit}' "$componentlist")" +masterhost="$(awk -v component="$component" '!/^ *(#|$)/ && $2 == component {print $1; exit}' "$componentlist")" +srchost="$(awk -v component="$component" '!/^ *(#|$)/ && $2 == component {print $3; exit}' "$componentlist")" +srcdir="$(awk -v component="$component" '!/^ *(#|$)/ && $2 == component {print $4; exit}' "$componentlist")" inextralist="$( awk -v component="$component" -v host="$thishost" ' - $2 == component { + !/^ *(#|$)/ && $2 == component { split($5,extra,",") for (i in extra) { if (host == extra[i]) { diff --git a/modules/roles/files/static-mirroring/staticsync-ssh-wrap b/modules/roles/files/static-mirroring/staticsync-ssh-wrap index 2cb8c317..c1bf2331 100755 --- a/modules/roles/files/static-mirroring/staticsync-ssh-wrap +++ b/modules/roles/files/static-mirroring/staticsync-ssh-wrap @@ -59,7 +59,7 @@ do_mirror() { one_more_arg "$@" local serial="$1"; shift - masterhost="$(awk -v component="$component" '$2 == component {print $1; exit}' "$COMPONENTLIST")" + masterhost="$(awk -v component="$component" '!/^ *(#|$)/ && $2 == component {print $1; exit}' "$COMPONENTLIST")" if [ -z "$masterhost" ]; then croak "Did not find master for component $component." elif [ "$masterhost" != "$remote_host" ]; then @@ -76,7 +76,7 @@ do_rsync_on_master() { local remote_host="$1"; shift local args="--server --sender -vlHtrze.iLsf --safe-links ." - for component in $(awk -v this_host="$(hostname -f)" '$1 == this_host {print $2}' $COMPONENTLIST); do + for component in $(awk -v this_host="$(hostname -f)" '!/^ *(#|$)/ && $1 == this_host {print $2}' $COMPONENTLIST); do if [ "$*" = "$args $component/-new-/" ] || [ "$*" = "$args ./$component/-new-/" ] ; then local path="$BASEDIR/master/$component-current-push" info "serving $remote_host with $path" @@ -104,7 +104,7 @@ do_rsync_on_source() { allowed_rsyncs=() if [ -e "$COMPONENTLIST" ]; then - for path in $(awk -v host="$(hostname -f)" '$3 == host {print $4}' $COMPONENTLIST); do + for path in $(awk -v host="$(hostname -f)" '!/^ *(#|$)/ && $3 == host {print $4}' $COMPONENTLIST); do allowed_rsyncs+=("--server --sender -lHtrze.iLsf --safe-links . $path/.") done fi @@ -136,7 +136,7 @@ do_update_component() { hit="$( awk -v this_host="$(hostname -f)" -v component="$component" -v host="$remote_host" ' - $1 == this_host && $2 == component { + !/^ *(#|$)/ && $1 == this_host && $2 == component { if ($3 == host) { print $4 exit -- 2.39.2