summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-05-18 01:30:01 +0000
committerNorbert Preining <preining@logic.at>2010-05-18 01:30:01 +0000
commitcbfe8861b6a4444084f664d0cb2a2a487a9f36c3 (patch)
tree14f707a65ce452bacf354be0056b467988c35e6c /Master
parent9793e8f67462f72e51284ef2ef492cfea31bfd22 (diff)
fix import of settings from 2009
git-svn-id: svn://tug.org/texlive/trunk@18324 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl20
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
2 files changed, 10 insertions, 12 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 4abcb420365..39d82f871b1 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1423,7 +1423,6 @@ sub import_settings_from_old_tlpdb {
# we found an old installation, so read that one in and save
# the list installed collections into an array.
info ("Trying to load old TeX Live Database,\n");
- info ("ignore warnings on unknown category Documentation\n");
$previoustlpdb = TeXLive::TLPDB->new(root => $dn);
if ($previoustlpdb) {
info ("Importing settings from old installation in $dn\n");
@@ -1472,32 +1471,31 @@ sub import_settings_from_old_tlpdb {
# now for the settings
# set the defaults to what is specified in the tlpdb
$vars{'option_doc'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"install_docfiles");
$vars{'option_src'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"install_srcfiles");
$vars{'option_fmt'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"create_formats");
$vars{'option_desktop_integration'} = 1 if win32();
- # option_path does not exist in older installation
$vars{'option_path'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
- "create_symlinks");
+ $previoustlpdb->option_pkg("00texlive.installation",
+ "path");
$vars{'option_path'} = 1 if win32();
$vars{'option_sys_bin'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"sys_bin");
$vars{'option_sys_man'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"sys_man");
$vars{'sys_info'} =
- $previoustlpdb->option_pkg("00texlive-installation.config",
+ $previoustlpdb->option_pkg("00texlive.installation",
"sys_info");
#
# import the set of selected architectures
- my @aar = $previoustlpdb->setting_pkg("00texlive-installation.config",
+ my @aar = $previoustlpdb->setting_pkg("00texlive.installation",
"available_architectures");
if (@aar) {
for my $b ($tlpdb->available_architectures) {
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 27f3835b646..811556c77bc 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1126,7 +1126,7 @@ sub option_pkg {
if (@_) { $self->_set_value_pkg($pkg, "opt_", $key, shift); }
my $ret = $self->_value_pkg($pkg, "opt_", $key);
# special case for location == __MASTER__
- if ($ret eq "__MASTER__" && $key eq "location") {
+ if (defined($ret) && $ret eq "__MASTER__" && $key eq "location") {
return $self->root;
}
return $ret;