SOURCES: kdediff.sh - proper empty diff check - control cvs add/removal

glen glen at pld-linux.org
Thu Apr 23 16:33:38 CEST 2009


Author: glen                         Date: Thu Apr 23 14:33:38 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper empty diff check
- control cvs add/removal

---- Files affected:
SOURCES:
   kdediff.sh (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/kdediff.sh
diff -u SOURCES/kdediff.sh:1.4 SOURCES/kdediff.sh:1.5
--- SOURCES/kdediff.sh:1.4	Thu Apr 23 12:14:15 2009
+++ SOURCES/kdediff.sh	Thu Apr 23 16:33:33 2009
@@ -16,14 +16,16 @@
 		svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/$pkg \
 		> $pkg-branch.diff.tmp
 
-	local c=$(grep -c Index: $pkg-branch.diff.tmp)
+	local c=$(grep -c '^--- ' $pkg-branch.diff.tmp)
 	if [ "$c" = 0 ]; then
 		echo >&2 "$pkg-branch.diff: empty, skipping"
 		rm $pkg-branch.diff.tmp
+		cvs remove -f $pkg-branch.diff
 		return
 	fi
 
 	cvs up -A $pkg-branch.diff
+	cvs add $pkg-branch.diff
 	mv $pkg-branch.diff.tmp $pkg-branch.diff
 	echo >&2 "Updated $pkg-branch.diff"
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdediff.sh?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list