try $Id in pod again, ignore in nightly update

git-svn-id: svn://tug.org/texlive/trunk@44201 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 5 insertions, 6 deletions

diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index b3831871e7b..bb5d08420e0 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -170,13 +170,12 @@ done
 # 
 if $config_scripts_only; then :; else
 
-# return 0 if files $1 and $2 are the same except for the first lines.
-# (we need to ignore the timestamps in the generation lines.)
-same_except_for_th ()
+# return 0 if files $1 and $2 are the same except for .TH and Id lines.
+same_except_for_auto ()
 {
   rm -f $TMPDIR/seft1 $TMPDIR/seft2
-  sed '/^\.TH/d' <"$1" >$TMPDIR/seft1
-  sed '/^\.TH/d' <"$2" >$TMPDIR/seft2
+  sed -e '/^\.TH/d' -e '/[$]Id:/d' <"$1" >$TMPDIR/seft1
+  sed -e '/^\.TH/d' -e '/[$]Id:/d' <"$2" >$TMPDIR/seft2
   cmp -s $TMPDIR/seft1 $TMPDIR/seft2
 }
 
@@ -190,7 +189,7 @@ for script in texmf-dist/scripts/texlive/tlmgr.pl install-tl; do
   basescript=`basename $script .pl`
   manfile=$mandir/man1/$basescript.1
 
-  if same_except_for_th $manfile $temp; then
+  if same_except_for_auto $manfile $temp; then
     $verbose "    `basename $manfile` ok."
     rm -f $manfile.new
   else