From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 3 Jan 2012 11:11:13 +0000 (+0100)
Subject: sync targets more robust
X-Git-Tag: before-alchemy~12
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=34838d74417bfbbf69937d8594e2e50234480d79;ds=sidebyside

sync targets more robust
---

diff --git a/Makefile b/Makefile
index 45136a57..a21ce8ff 100644
--- a/Makefile
+++ b/Makefile
@@ -138,13 +138,15 @@ BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
 	./sfa/importer/sfa-import-plc.py ./sfa/importer/sfa-nuke-plc.py ./sfa/server/sfa-start.py \
 	$(CLIENTS)
 
-sync:
+synccheck: 
 ifeq (,$(SSHURL))
-	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
+	@echo "*sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
 	@echo "  e.g. make sync PLC=private.one-lab.org"
 	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
 	@exit 1
-else
+endif
+
+sync: synccheck
 	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
@@ -152,20 +154,20 @@ else
 	+$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
 	+$(RSYNC) ./sfa/storage/sfa.sql $(SSHURL)/usr/share/sfa/
 	$(SSHCOMMAND) exec service sfa restart
-endif
 
 # 99% of the time this is enough
-fastsync:
+fastsync: synccheck
 	+$(RSYNC) --relative ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 	$(SSHCOMMAND) exec service sfa restart
 
-clientsync:
+clientsync: synccheck
 	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
 
-ricasync:
+ricasync: synccheck
 	+$(RSYNC) --relative ./sfa/fd ./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
+	$(SSHCOMMAND) exec service sfa restart
 
-.PHONY: sync fastsync clientsync
+.PHONY: synccheck sync fastsync clientsync ricasync
 
 ##########
 CLIENTLIBFILES= \