texlive[55179] Master/tlpkg/bin/tl-update-tlnet: default to not using

[commits+karl at tug.org]

Revision: 55179
          http://tug.org/svn/texlive?view=revision&revision=55179
Author:   karl
Date:     2020-05-17 19:17:18 +0200 (Sun, 17 May 2020)
Log Message:
-----------
default to not using cow-shell.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tl-update-tlnet

Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet	2020-05-17 16:46:24 UTC (rev 55178)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet	2020-05-17 17:17:18 UTC (rev 55179)
@@ -17,7 +17,7 @@
 
 check_consistency=true
 chicken=false
-cow_shell=cow-shell
+cow_shell=/bin/sh
 critical=
 pretest=false
 recreate=
@@ -30,6 +30,7 @@
 
 while test $# -gt 0; do
   case $1 in
+  --cow)               cow_shell=cow-shell;;     # see comments below
   --critical)          critical=--all;;
   --dest)              shift; tlweb=$1;;
   --dry-run|-n)        chicken=true;;
@@ -36,7 +37,6 @@
   --gpgcmd)            shift; gpgcmd="--gpgcmd \"$1\"";;
   --master)            shift; Master=$1;;
   --no-consistency)    check_consistency=false;; # takes a long time.
-  --no-cow)            cow_shell=/bin/sh;;
   --no-install-pkg)    update_install_pkg=false;;# trunk update after freeze
   --no-testinstall|-N) testinstall=false;;       # and no updates; quit early.
   --pretest)           tlweb=/home/ftp/texlive/tlpretest;;
@@ -77,7 +77,7 @@
 # Below, we check for broken symlinks in the bin/ dir as installed.
 $Master/tlpkg/bin/tl-check-symlinks $Master/bin
 
-# Keep the default out of ~ftp/texlive, which CTAN mirrors much of
+# Keep the default out of ~ftp/texlive, which CTAN mirrors much of.
 test -z "$tltrybase" \
 && tltrybase=`cd $tlweb/../.. && pwd`/tlnet-trial-`date +%y%m%d`
 tltry=$tltrybase/tlsrc.try
@@ -104,8 +104,17 @@
     : # skip mactex
   elif test "x$cow_shell" = xcow-shell; then
     cp -al "$f" $tltry  # assume GNU cp so we can link instead of copy
+    # However, cow-shell may be introducing strange errors on the 
+    # tug.org server we switched to in 2020, causing the release (tlnet)
+    # directory to be modified even when changes should be kept to the
+    # test (tltry) directory (ultimately resulting in checksum errors
+    # since the containers and tlpdb don't match, after a failed rebuild).
+    # 
+    # We're not sure. But let's just default to straight copies,
+    # avoiding cow-shell, at least until we see if the problem happens
+    # without it, or we can get to the bottom of it.
   else
-    # no cow-shell, straight copy, for testing.
+    # no cow-shell, straight copy.
     cp -a "$f" $tltry   # still assuming GNU cp for -a
   fi
 done