fix mkrel's RELTAIL handling

	* mkrel: Rework quoting for RELTAIL check.  Don't check RELTAIL if
	doing a "-current" snapshot.

ticket: new
target_version: 1.4
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16850 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 990ca78cf1067de1a91b258b0e08835dd72b0e21..4de8fce3856c6dbed0ab20d919f2849c5ac0f54c 100644 (file)
--- 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 97a08d1260fb9f8fa2ba7c472a48ae07a7f57c8c..804dd5f907ca81b1ad67f635f4556a30f7ca338d 100644 (file)
--- 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