Reverted previous change and added DIFFTAG check. Problem was not

in cvs2cl invocation; error occurred because no value was found
for DIFFTAG; in that case, we just want to skip generating
LatestChanges.

diff --git a/releasetools/docbook-build b/releasetools/docbook-build
index d11091dc2dc4acd11b7c45d4b61b12f620e6cea5..de0cccd4955836be08e58c4b6ba119f58949d6c0 100755 (executable)
--- a/releasetools/docbook-build
+++ b/releasetools/docbook-build
@@ -265,6 +265,11 @@ It is intended for testing purposes only and otherwise comes with no
 guarantees. It may in fact be broken.
 EOF
 
+    if [ $DIFFTAG ]; then
+      cvs2cl -S --delta $DIFFTAG:HEAD --stdout $DISTRO \
+      | expand -t2 > $DISTRO/LatestChanges
+    fi
+
     if grep "<xsl:stylesheet" $DISTRO/VERSION >/dev/null; then
       cp -p $DISTRO/VERSION $DISTRO/VERSION.tmp
       sed "s/Version>.\+</Version>$DATE\_$TIME\_$RELEASEVERSION</" $DISTRO/VERSION.tmp > $DISTRO/VERSION