texlive[44201] Master: try $Id in pod again, ignore in nightly update

[commits+karl at tug.org]

Revision: 44201
          http://tug.org/svn/texlive?view=revision&revision=44201
Author:   karl
Date:     2017-05-05 17:33:32 +0200 (Fri, 05 May 2017)
Log Message:
-----------
try $Id in pod again, ignore in nightly update

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/bin/tl-update-auto

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2017-05-05 10:38:26 UTC (rev 44200)
+++ trunk/Master/install-tl	2017-05-05 15:33:32 UTC (rev 44201)
@@ -2909,8 +2909,11 @@
 distribution (L<http://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
+$Id$
 =cut
 
+# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html
+
 ### Local Variables:
 ### perl-indent-level: 2
 ### tab-width: 2

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-05-05 10:38:26 UTC (rev 44200)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-05-05 15:33:32 UTC (rev 44201)
@@ -8809,6 +8809,7 @@
 distribution (L<http://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
+$Id$
 =cut
 
 # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html

Modified: trunk/Master/tlpkg/bin/tl-update-auto
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-auto	2017-05-05 10:38:26 UTC (rev 44200)
+++ trunk/Master/tlpkg/bin/tl-update-auto	2017-05-05 15:33:32 UTC (rev 44201)
@@ -170,13 +170,12 @@
 # 
 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 @@
   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