[Fusionforge-commits] FusionForge branch master updated. 0ba9968e03a235fff2ea0ffe8eb7340e578857e1

[Roland Mas]

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  0ba9968e03a235fff2ea0ffe8eb7340e578857e1 (commit)
      from  ace2d257ac79734c8befd1a5f8133f98e81249e4 (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 0ba9968e03a235fff2ea0ffe8eb7340e578857e1
Author: Roland Mas <lolando at debian.org>
Date:   Wed Dec 18 15:29:28 2013 +0100

    Let's try to adapt to btrfs

diff --git a/tests/lxc/lxc-centos5 b/tests/lxc/lxc-centos5
index 206e117..640e099 100755
--- a/tests/lxc/lxc-centos5
+++ b/tests/lxc/lxc-centos5
@@ -390,6 +390,7 @@ copy_centos()
 
     # make a local copy of the minicentos
     echo -n "Copying rootfs to $rootfs ..."
+    [ -d $rootfs ] && rmdir $rootfs
     cp --reflink=auto -a $cache/rootfs-$arch $rootfs || return 1
     return 0
 }
diff --git a/tests/lxc/lxc-centos6 b/tests/lxc/lxc-centos6
index f25227c..396b5d1 100755
--- a/tests/lxc/lxc-centos6
+++ b/tests/lxc/lxc-centos6
@@ -324,6 +324,7 @@ copy_centos()
 
     # make a local copy of the minicentos
     echo -n "Copying rootfs to $rootfs ..."
+    [ -d $rootfs ] && rmdir $rootfs
     cp --reflink=auto -a $cache/rootfs-$arch $rootfs || return 1
     return 0
 }
diff --git a/tests/lxc/lxc-debian6 b/tests/lxc/lxc-debian6
index d62f8f3..851c55e 100755
--- a/tests/lxc/lxc-debian6
+++ b/tests/lxc/lxc-debian6
@@ -255,6 +255,7 @@ copy_debian()
 
     # make a local copy of the minidebian
     echo -n "Copying rootfs to $rootfs..."
+    [ -d $rootfs ] && rmdir $rootfs
     cp --reflink=auto -a "$cache/rootfs-$SUITE-$arch" $rootfs || return 1
     return 0
 }
diff --git a/tests/lxc/lxc-debian7 b/tests/lxc/lxc-debian7
index 545b72f..d3d7815 100644
--- a/tests/lxc/lxc-debian7
+++ b/tests/lxc/lxc-debian7
@@ -256,6 +256,7 @@ copy_debian()
 
     # make a local copy of the minidebian
     echo -n "Copying rootfs to $rootfs..."
+    [ -d $rootfs ] && rmdir $rootfs
     cp --reflink=auto -a "$cache/rootfs-$SUITE-$arch" $rootfs || return 1
     return 0
 }
diff --git a/tests/lxc/lxc-debian8 b/tests/lxc/lxc-debian8
index adf6f98..b436a2b 100644
--- a/tests/lxc/lxc-debian8
+++ b/tests/lxc/lxc-debian8
@@ -257,6 +257,7 @@ copy_debian()
 
     # make a local copy of the minidebian
     echo -n "Copying rootfs to $rootfs..."
+    [ -d $rootfs ] && rmdir $rootfs
     cp --reflink=auto -a "$cache/rootfs-$SUITE-$arch" $rootfs || return 1
     return 0
 }

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

Summary of changes:
 tests/lxc/lxc-centos5 |    1 +
 tests/lxc/lxc-centos6 |    1 +
 tests/lxc/lxc-debian6 |    1 +
 tests/lxc/lxc-debian7 |    1 +
 tests/lxc/lxc-debian8 |    1 +
 5 files changed, 5 insertions(+)


hooks/post-receive
-- 
FusionForge