summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-14 23:54:53 +0000
committerKarl Berry <karl@freefriends.org>2013-04-14 23:54:53 +0000
commit906864d421e84eca0fbeeb68ba5c6daa481f00d2 (patch)
tree410a63b426dc5c7b289d471d6919a68efbfc8fb7
parent957ad42863858b1b3cb66be2b30f37260cc3ce1a (diff)
omit adjustrepo after install, else update --list fails
git-svn-id: svn://tug.org/texlive/trunk@29921 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl1
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet4
2 files changed, 5 insertions, 0 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index a86b60dc2e7..85b475d08e4 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -3255,6 +3255,7 @@ sub action_update {
&& $remotetlpdb->media ne "virtual"
&& !$opts{"dry-run"}
&& !$opts{"repository"}
+ && !$ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"}
) {
tlwarn(<<END_DISK_WARN);
tlmgr: Your installation is set up to look on the disk for updates.
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index c63ebb347db..b8f7e27e3a5 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -115,8 +115,12 @@ option_fmt 1
option_letter 0
option_src 1
option_path 0
+option_adjustrepo 0
" >texlive.profile
+# silence warnings we do not need to see.
+TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK
+
echo "$0: Running test install (log: `pwd`/install.log)..."
perl install-tl -location $tltry -profile texlive.profile >install.log 2>&1\
|| true # install-tl can fail, but we test the output, so don't abort.