From 8aa328f428139b9864b1b6d74b951bc7b59b0e69 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 28 Aug 2009 14:15:13 +0000 Subject: 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 --- Master/install-tl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Master') 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); -- cgit v1.2.3