From 2e716c180b3a00c80c40ed465767b1e1c1998ab1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 12 May 2011 23:59:31 +0000 Subject: ddebug for low-level persistent download msgs, wording tweaks git-svn-id: svn://tug.org/texlive/trunk@22448 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 7 ++++--- Master/tlpkg/TeXLive/TLUtils.pm | 15 ++++++++------- Master/tlpkg/bin/tl-makeself-from-tlnet | 7 +++++-- 3 files changed, 17 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 3e022ef8ae5..81322002c5e 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -372,9 +372,10 @@ sub main { if (!defined($do_persistent)) { $do_persistent = 1; } - debug("tlmgr:main: persistent download are $do_persistent\n"); - TeXLive::TLUtils::setup_persistent_downloads() - if $do_persistent; + ddebug("tlmgr:main: do persistent downloads = $do_persistent\n"); + if ($do_persistent) { + TeXLive::TLUtils::setup_persistent_downloads() ; + } if (!defined($::tldownload_server)) { debug("tlmgr:main: ::tldownload_server not defined\n"); } else { diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 3fb87a0759b..547f9a70edc 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -3223,21 +3223,22 @@ sub forward_slashify { =item C -Set up to use persistent connections using LWP/TLDownload. +Set up to use persistent connections using LWP/TLDownload, that is look +for a download server. Return the TLDownload object if successful, else +false. =cut -sub setup_persistent_downloads -{ +sub setup_persistent_downloads { if ($TeXLive::TLDownload::net_lib_avail) { - debug("setting up persistent downloads succeeded!\n"); + ddebug("setup_persistent_downloads has net_lib_avail set\n"); $::tldownload_server = TeXLive::TLDownload->new; if (!defined($::tldownload_server)) { - debug("TLUtils:setup_persistent_downloads: ::tldownload_server undefined\n"); + ddebug("TLUtils:setup_persistent_downloads: failed to get ::tldownload_server\n"); } else { - debug("TLUtils:setup_persistent_downloads: succeeded in getting ::tldownload_server\n"); + ddebug("TLUtils:setup_persistent_downloads: got ::tldownload_server\n"); } - return ($::tldownload_server); + return $::tldownload_server; } return 0; } diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet index 8b5766b98fc..fa50b4fc9bf 100755 --- a/Master/tlpkg/bin/tl-makeself-from-tlnet +++ b/Master/tlpkg/bin/tl-makeself-from-tlnet @@ -60,14 +60,17 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb"; then echo "$0: updating in $ROOT..." tlmgrversion=`tlmgr version | grep '^TeX Live.*version' | awk '{print $NF}'` - echo "$0: found TeX Live $tlmgrversion" + echo "$0: tlmgr version says this is TeX Live $tlmgrversion" if test "x$WORKINGRELEASE" != "x$tlmgrversion"; then if test "x$1" = "x--upgrade"; then echo "$0: upgrading from $tlmgrversion to $WORKINGRELEASE." else - echo "$0: upgrading not supported: target release is $WORKINGRELEASE" >&2 + echo "$0: upgrading from $tlmgrversion not supported:" >&2 + echo "$0: can only upgrade (cautiously) from $WORKINGRELEASE." >&2 exit 1 fi + else + echo "$0: proceeding with tlmgr update." fi # move the architecture-specific files to the top level. -- cgit v1.2.3