[Fusionforge-commits] FusionForge branch master updated. 722f711a641c85efcb4cb49b6b8b859ffe0a1421

Roland Mas lolando at fusionforge.org
Wed May 15 10:46:51 CEST 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  722f711a641c85efcb4cb49b6b8b859ffe0a1421 (commit)
      from  75dd4c45e7da97f112625ecbbbc8a88597c533b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 722f711a641c85efcb4cb49b6b8b859ffe0a1421
Author: Roland Mas <lolando at debian.org>
Date:   Wed May 15 10:46:44 2013 +0200

    Fix determination of where to store LXC templates on the buildbot

diff --git a/tests/lxc/Makefile b/tests/lxc/Makefile
index 2452748..5efb0db 100644
--- a/tests/lxc/Makefile
+++ b/tests/lxc/Makefile
@@ -2,7 +2,7 @@
 -include ../config/$(shell hostname)
 
 # Guess where lxc data is and default to /usr/lib/lxc
-LXC_DATA:=$(shell [ -d /usr/lib/lxc ] && echo /usr/lib/lxc)$(shell [ -d /usr/share/lxc ] && echo /usr/share/lxc)
+LXC_DATA:=$(shell [ -d /usr/lib/lxc ] && echo /usr/lib/lxc || [ -d /usr/share/lxc ] && echo /usr/share/lxc)
 LXC_DATA:=$(shell [ -z "$(LXC_DATA)" ] && echo /usr/lib/lxc)$(shell [ -z "$(LXC_DATA)" ] || echo "$(LXC_DATA)")
 TEMPLATELIST:=$(LXC_DATA)/templates/lxc-debian7 $(LXC_DATA)/templates/lxc-debian6 $(LXC_DATA)/templates/lxc-centos5 $(LXC_DATA)/templates/lxc-centos6
 

-----------------------------------------------------------------------

Summary of changes:
 tests/lxc/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list