From 7810775d1cb9bffd6fdd4ab34fa9cda00b934816 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 14 May 2018 17:43:35 +0000
Subject: error msg, branch doc

git-svn-id: svn://tug.org/texlive/trunk@47713 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/TeXLive/TLPDB.pm     |  5 +++--
 Master/tlpkg/bin/tl-update-bindir |  4 ++--
 Master/tlpkg/doc/releng.txt       | 15 +++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'Master')

diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index e41aea078e2..920db228282 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -356,11 +356,12 @@ sub from_file {
       debug("TLPDB: downloading $path.xz didn't succeed, try $path\n");
       my $ret = TeXLive::TLUtils::download_file($path, $tlpdbfile);
       # better to check both, the return value AND the existence of the file
-      if ($ret && (-r "$tlpdbfile")) {
+      if ($ret && (-r $tlpdbfile)) {
         # do nothing
       } else {
         unlink($tlpdbfile);
-        die "$0: open tlpdb($path) failed: $!";
+        tldie(  "$0: TLPDB::from_file could not download $path;\n"
+              . "$0: maybe the repository setting should be changed.\n");
       }
     }
     # if we are still here, then either the xz version was downloaded
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index e6ad78ad3fc..d5af9efb66b 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -245,12 +245,12 @@ for tlplat in $tlplats; do
 
   ourdel=$tmpdir/2del
   ouradd=$tmpdir/2add
-    # looking for deletions, but don't delete (x)asy, biber, xindy.
+    # looking for deletions, but don't delete (x)asy, biber, xindy, ketcindy.
   comm -23 $tmpdir/now $tmpdir/new \
   | egrep -v '^(x?asy(\.exe)?|freeglut\.dll)$' \
   | egrep -v '^biber(\.exe)?$' \
   | egrep -v '^dvisvgm$' \
-  | egrep -v 'xindy' \
+  | egrep -v '(x|ketc)indy' \
   >$ourdel  # intentionally anything matching xindy
   comm -13 $tmpdir/now $tmpdir/new >$ouradd  # looking for additions
 
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 8d330a59e70..7e305a5e0fa 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -329,12 +329,15 @@ svn copy -r 47460 \
   during-the-year rebuilds or for the distros, if they request it:
 cd /home/texlive
 rm -rf branch # when starting a new year on tug
-mkdir branch; cd branch
-svn co file:///home/svn/texlive/branches/branch$this/Build/source . >&out
-
-   When bug fixes are done, i.e., at another stable point, make another tag:
-#svn copy -r 44590 -m'texlive-2017.1 tag based on r44590, with critical luatex bug fixes' \
-#  svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2017.1
+mkdir branch
+cd branch
+svn co svn://tug.org/texlive/branches/branch$this/Build/source . >&out
+
+  Do a test build, commit when successful.
+  Ask for rebuilds,
+  When (enough) rebuilds are done, make another tag:
+#svn copy -r 47626 -m'texlive-2018.1 tag based on r47626, with critical dvipdfmx and other bug fixes; http://tug.org/pipermail/tlbuild/2018q2/004222.html' \
+#  svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-2018.1
 
 - update ~karl/bin/cron.tl, and reenable when feel ready.
 critical=
-- 
cgit v1.2.3