[Fusionforge-commits] FusionForge branch master updated. bf3cf5e7e0881b9f95efc19115065d9955c659b6

Roland Mas lolando at fusionforge.org
Wed May 15 10:53:52 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  bf3cf5e7e0881b9f95efc19115065d9955c659b6 (commit)
      from  3b8bf03ebdc2819a2e15b1efc3aa1be9cbaa2056 (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 bf3cf5e7e0881b9f95efc19115065d9955c659b6
Author: Roland Mas <lolando at debian.org>
Date:   Wed May 15 10:53:45 2013 +0200

    Fix determination of where to store LXC templates on the buildbot

diff --git a/tests/lxc/Makefile b/tests/lxc/Makefile
index 5473031..25bdb42 100644
--- a/tests/lxc/Makefile
+++ b/tests/lxc/Makefile
@@ -3,7 +3,7 @@
 
 # Guess where lxc data is and default to /usr/share/lxc
 LXC_DATA:=$(shell [ -d /usr/share/lxc ] && echo /usr/share/lxc || ([ -d /usr/lib/lxc ] && echo /usr/lib/lxc))
-LXC_DATA:=$(shell [ -z "$(LXC_DATA)" ] && echo /usr/lib/lxc)$(shell [ -z "$(LXC_DATA)" ] || echo "$(LXC_DATA)")
+LXC_DATA:=$(shell [ -z "$(LXC_DATA)" ] && echo /usr/share/lxc || echo "$(LXC_DATA)")
 TEMPLATELIST:=$(LXC_DATA)/templates/lxc-debian7 $(LXC_DATA)/templates/lxc-debian6 $(LXC_DATA)/templates/lxc-centos5 $(LXC_DATA)/templates/lxc-centos6
 
 default: checkdepends installtemplate

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

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