[gentoo-commits] catalyst r1310 - in trunk: . targets/livecd-stage2

[gentoo-commits] catalyst r1310 - in trunk: . targets/livecd-stage2

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-02-20 15:18:08 +0000 (Wed, 20 Feb 2008)
New Revision: 1310

Modified:
   trunk/ChangeLog
   trunk/targets/livecd-stage2/livecd-stage2-controller.sh
Log:
Only call find on libdirs that actually exist. Thanks to Kristoffer <krek6597@student.uu.se> in bug 210807

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-20 03:36:18 UTC (rev 1309)
+++ trunk/ChangeLog	2008-02-20 15:18:08 UTC (rev 1310)
@@ -2,6 +2,11 @@
 # $Id: $
 
   20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Only call find on libdirs that actually exist. Thanks to Kristoffer
+  <krek6597@student.uu.se> in bug 210807
+
+  20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
   Add warning about -* in foo/use in the spec
 

Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh
===================================================================
--- trunk/targets/livecd-stage2/livecd-stage2-controller.sh	2008-02-20 03:36:18 UTC (rev 1309)
+++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh	2008-02-20 15:18:08 UTC (rev 1310)
@@ -94,9 +94,13 @@
 		exec_in_chroot ${clst_fsscript}
 		;;
 	clean)
-		find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
-		find ${clst_chroot_path}/usr/lib32 -iname "*.pyc" -exec rm -f {} \;
-		find ${clst_chroot_path}/usr/lib64 -iname "*.pyc" -exec rm -f {} \;
+		for x in lib lib32 lib64
+		do
+			if [ -d "${clst_chroot_path}/usr/${x}" ]
+			then
+				find "${clst_chroot_path}/usr/${x}" -iname "*.pyc" -exec rm -f {} \;
+			fi
+		done
 		;;
 	bootloader)
 		shift

-- 
gentoo-commits@lists.gentoo.org mailing list