packages: kdediff.sh - skip on no changes

glen glen at pld-linux.org
Fri May 8 11:27:11 CEST 2009


Author: glen                         Date: Fri May  8 09:27:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip on no changes

---- Files affected:
packages:
   kdediff.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/kdediff.sh
diff -u packages/kdediff.sh:1.5 packages/kdediff.sh:1.6
--- packages/kdediff.sh:1.5	Thu Apr 23 16:33:33 2009
+++ packages/kdediff.sh	Fri May  8 11:27:05 2009
@@ -20,12 +20,20 @@
 	if [ "$c" = 0 ]; then
 		echo >&2 "$pkg-branch.diff: empty, skipping"
 		rm $pkg-branch.diff.tmp
-		cvs remove -f $pkg-branch.diff
+		cvs remove -f $pkg-branch.diff 2>/dev/null
 		return
 	fi
 
 	cvs up -A $pkg-branch.diff
-	cvs add $pkg-branch.diff
+	cvs add $pkg-branch.diff 2>/dev/null
+
+	local d=$(interdiff $pkg-branch.diff{,.tmp} | wc -l)
+	if [ "$d" = 0 ]; then
+		echo >&2 "$pkg-branch.diff: no new changes, skip"
+		rm $pkg-branch.diff.tmp
+		return
+	fi
+
 	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/packages/kdediff.sh?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list