From 4a171b23e01d5114dd776d88ff3212f21b9d9142 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 8 Dec 2012 18:04:41 +0100 Subject: [PATCH] Change format of componentlist --- .../static-mirroring/static-master-update-component | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component index a79f342f..64bca492 100755 --- a/modules/roles/files/static-mirroring/static-master-update-component +++ b/modules/roles/files/static-mirroring/static-master-update-component @@ -77,8 +77,9 @@ if [ "${component%/*}" != "$component" ] ; then exit 1 fi -src="$(awk -v component="$component" '$1 == component {print $2; exit}' "$componentlist")" -if [ -z "$src" ]; then +srchost="$(awk -v component="$component" '$1 == component {print $2; exit}' "$componentlist")" +srcdir="$(awk -v component="$component" '$1 == component {print $3; exit}' "$componentlist")" +if [ -z "$srchost" ] || [ -z "$srcdir" ]; then echo >&2 "$0: Invalid component: $component (not found in $componentlist)"; exit 1 fi @@ -88,6 +89,12 @@ if ! [ -d "$tgt" ]; then exit 1 fi +if [ "$srchost" = "`hostname -f`" ]; then + src="$srcdir" +else + src="$srchost:$srcdir" +fi + echo "$0: Acquiring locks..." lock 200 "$base" 0 lock 201 "$tgt" 1 -- 2.39.2