[Pkg-shadow-commits] r3702 - debian/trunk/tests/common

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-02-12 22:19:05 +0000 (Sun, 12 Feb 2012)
New Revision: 3702

Modified:
   debian/trunk/tests/common/config.sh
Log:
Do not copy the .svn directories when preparing a chroot.


Modified: debian/trunk/tests/common/config.sh
===================================================================
--- debian/trunk/tests/common/config.sh	2012-02-12 21:34:49 UTC (rev 3701)
+++ debian/trunk/tests/common/config.sh	2012-02-12 22:19:05 UTC (rev 3702)
@@ -54,6 +54,7 @@
 {
 	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 @@
 	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
 }