summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-08-28 14:15:13 +0000
committerNorbert Preining <preining@logic.at>2009-08-28 14:15:13 +0000
commit8aa328f428139b9864b1b6d74b951bc7b59b0e69 (patch)
tree4f147344cdd213f211c31b794a85e7a21404483e /Master/install-tl
parent2f43e3eb8fbcc2b9b14bb83694c6dde17c22f6d1 (diff)
do not suggest importing of old settings if tlmgr and install-tl are
in the same tree git-svn-id: svn://tug.org/texlive/trunk@14913 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl5
1 files changed, 4 insertions, 1 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 717a1ac1b42..0a285b8f724 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -502,8 +502,11 @@ if ($opt_profile eq "") {
if ($tlmgrwhich) {
my $dn = dirname($tlmgrwhich);
$dn = abs_path("$dn/../..");
+ # The "make Karl happy" case, check that we are not running install-tl
+ # from the same tree where tlmgr is hanging around
+ my $install_tl_root = abs_path($::installerdir);
my $tlpdboldpath = "$dn/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName";
- if (-r $tlpdboldpath) {
+ if (-r $tlpdboldpath && $dn ne $install_tl_root) {
# we found an old installation, so read that one in and save
# the list installed collections into an array.
$previoustlpdb = TeXLive::TLPDB->new(root => $dn);