Change format of componentlist

diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component
index a79f342f13bd833de842a75472c70ffa0d36d018..64bca49280f45ae41c6b718659fbd1e63b87b683 100755 (executable)
--- 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