From: Tom Yu <tlyu@mit.edu>
Date: Sun, 31 Oct 2004 20:02:47 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~174
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9e5c45921b337d4efcc118cd3eea630718e17f2;p=krb5.git

pullup from trunk

ticket: 2757
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16852 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 990ca78cf..4de8fce38 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-31  Tom Yu  <tlyu@mit.edu>
+
+	* mkrel: Rework quoting for RELTAIL check.  Don't check RELTAIL if
+	doing a "-current" snapshot.
+
 2004-09-24  Tom Yu  <tlyu@mit.edu>
 
 	* mkrel: Rework somewhat to handle patchlevel.h being the new
diff --git a/src/util/mkrel b/src/util/mkrel
index 97a08d126..804dd5f90 100644
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -120,10 +120,11 @@ if test $newstyle = t; then
 	if test "$KRB5_RELTAG" != $reltag; then
 		echo "WARNING: patchlevel.h '$KRB5_RELTAG' != $reltag"
 	fi
-	if test "$KRB5_MAJOR_RELEASE" != $relmajor || \
-		test "$KRB5_MINOR_RELEASE" != $relminor || \
-		test "$KRB5_PATCHLEVEL" != $relpatch || \
-		test "$KRB5_RELTAIL" != $reltail; then
+	if test "$KRB5_MAJOR_RELEASE" != "$relmajor" || \
+		test "$KRB5_MINOR_RELEASE" != "$relminor" || \
+		test "$KRB5_PATCHLEVEL" != "$relpatch" || \
+		( test -n "$reltail" && \
+			test "$KRB5_RELTAIL" != "$reltail" ); then
 
 		echo "WARNING: patchlevel.h $KRB5_MAJOR_RELEASE.$KRB5_MINOR_RELEASE.$KRB5_PATCHLEVEL${KRB5_RELTAIL+-$KRB5_RELTAIL} != $relmajor.$relminor.$relpatch${reltail+-$reltail}"
 	fi