From 05c7958f9f9dd12d5f802d679d69c651699f23b3 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 28 Dec 2009 22:32:48 +0100 Subject: runmirrors only look at mhop/&taged entries if doing mhop push Signed-off-by: Joerg Jaspert --- bin/runmirrors | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bin/runmirrors') diff --git a/bin/runmirrors b/bin/runmirrors index 791ee16..23c2e32 100755 --- a/bin/runmirrors +++ b/bin/runmirrors @@ -84,8 +84,8 @@ fi CONF=${CONF:-""} # Set the default to all, if we didnt get told about it. Currently -# valid: all - normal push. mhop - multi-hop multi-stage push. Default is all. -# If mhop we will run a normal stage1 push *and then exit*. +# valid: all - normal push. mhop - multi-hop multi-stage push, this is stage1, +# stage2 - staged push, second phase. Default is all. PUSHKIND=${PUSHKIND:-"all"} # If we are pushed from within ftpsync. Default false. @@ -183,6 +183,14 @@ while read MTYPE MLNAME MHOSTNAME MUSER MSSHOPT; do continue fi + # If we are told we have a mhop sync to do, we will only look at staged/mhop + # entries and ignore the rest. + if [ "x${PUSHKIND}x" = "xmhopx" ]; then + if [ "x${MTYPE}x" != "xstagedx" ] || [ "x${MTYPE}x" != "xmhopx" ]; then + continue + fi + fi + # Now, MSSHOPT may start with a -. In that case the whole rest of the line is taken # as a set of options to give to ssh, we pass it without doing anything with it. # If it starts with a 1 or 2 then it will tell us about the ssh protocol version to use, -- cgit v1.2.3