[Devil-linux-commit] build/scripts patch-o-matic,1.26,1.27

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11151/scripts

Modified Files:
	patch-o-matic 
Log Message:
disable policy
correctly find all patches


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- patch-o-matic	25 Jul 2004 21:27:54 -0000	1.26
+++ patch-o-matic	26 Jul 2004 02:37:08 -0000	1.27
@@ -32,18 +32,18 @@
 		export IPTABLES_DIR
 
 		# update the patch-o-matic.exclude file to make sure we have everything listed in there
-		for PDIR in $(ls -d *); do
-			SUITE=$(grep "Repository:" $PDIR/info 2> /dev/null )
-			# remove whitespaces
-			SUITE=$(echo ${SUITE##*:} | tr -d "\t ")
-			if [ ! -z "$SUITE" ]; then
-				if [ -z "$(grep $PDIR $MYDIR/config/patch-o-matic.exclude)" ]; then
-					echo "$SUITE/$PDIR" >> $MYDIR/config/patch-o-matic.exclude
+		for PDIR in $(ls -d -1 *); do
+			if [ -d "$PDIR" ]; then
+				SUITE=$(grep "Repository:" $PDIR/info 2> /dev/null )
+				# remove whitespaces
+				SUITE=$(echo ${SUITE##*:} | tr -d "\t ")
+				if [ -n "$SUITE" ]; then
+					if [ -z "$(grep $SUITE/$PDIR\$ $MYDIR/config/patch-o-matic.exclude)" ]; then
+						echo "$SUITE/$PDIR" >> $MYDIR/config/patch-o-matic.exclude
+					fi
 				fi
 			fi
 		done
-		cat $MYDIR/config/patch-o-matic.exclude | sort -u > $WORKDIR/patch-o-matic.exclude || exit 1
-		mv $WORKDIR/patch-o-matic.exclude  $MYDIR/config/patch-o-matic.exclude || exit 1
 		
 		# reformat to fit as commandline option to runme
 		EXCLUDE=""