From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 23 Apr 2009 14:33:33 +0000 (+0000)
Subject: - proper empty diff check
X-Git-Tag: auto/th/rpm-build-tools-4.5-5~7^2~130
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=dd2103650a9192650a9498a86383b3ee87059fab;p=packages%2Frpm-build-tools.git

- proper empty diff check
- control cvs add/removal

Changed files:
    kdediff.sh -> 1.5
---

diff --git a/kdediff.sh b/kdediff.sh
index faec968..15603e0 100644
--- a/kdediff.sh
+++ b/kdediff.sh
@@ -16,14 +16,16 @@ rundiff() {
 		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"
 }