X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=02bab1b8f4f25c8bda62158efbc57382be0f0a8e;hb=f857533f5e3535599eb4b74b8ac214e50370a542;hp=5c18942c0d7214f71c937e753713e5c496bcd737;hpb=0628d10d2570922488f8170b65fbd67b57927bc6;p=sfa.git diff --git a/Makefile b/Makefile index 5c18942c..02bab1b8 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ files: @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' git-files: - @git ls-files | grep -v '\.doc$$' + @git ls-files | egrep -v '\.(doc|html|pdf)$$' tags: $(MAKE) git-files | xargs etags @@ -191,7 +191,7 @@ SSHCOMMAND:=ssh root@$(PLC) else ifdef PLCHOSTLXC SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME) -SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env +SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no $(GUESTHOSTNAME) else ifdef PLCHOSTVS SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME) @@ -224,8 +224,12 @@ BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \ synclib: synccheck +$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/ +synclib3: synccheck + +$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python3.\*/site-packages/ synclibdeb: synccheck +$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/share/pyshared/ +syncmigrations: + +$(RSYNC) ./sfa/storage/migrations/versions/*.py $(SSHURL)/usr/share/sfa/migrations/versions/ syncbin: synccheck +$(RSYNC) $(BINS) $(SSHURL)/usr/bin/ syncinit: synccheck