From 553718623c0af3491f7868cd61b08a8722cb3b33 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 12 Feb 2012 22:19:05 +0000 Subject: [PATCH] Do not copy the .svn directories when preparing a chroot. --- tests/common/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/common/config.sh b/tests/common/config.sh index 667be0c9..511b9a03 100644 --- a/tests/common/config.sh +++ b/tests/common/config.sh @@ -54,6 +54,7 @@ prepare_chroot () { mkdir tmp/root cp -rfdp config_chroot/* tmp/root/ + find tmp/root/ -name .svn -type d -print0 | xargs -0 rm -rf lists=/root/tests/common/config_chroot.list [ -f config_chroot.list ] && lists="$lists config_chroot.list" @@ -114,7 +115,7 @@ clean_chroot () find config_chroot -depth -type d | while read d do d=${d#config_chroot} - rmdir tmp/root$d + [ -d "tmp/root$d" ] && rmdir tmp/root$d done }