summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-05-18 02:20:12 +0000
committerNorbert Preining <preining@logic.at>2017-05-18 02:20:12 +0000
commita6d364d320f2f8e4c949ef9188d3019afbf46967 (patch)
tree2b7d37d1b244ec013fb3f4c32f27427c26f78560 /Master/install-tl
parentf307ec62d05363937c4a4bd9a9f164623bc7e9d1 (diff)
fix breakage at and of installation when selecting custom collections (scheme-custom)
git-svn-id: svn://tug.org/texlive/trunk@44400 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl16
1 files changed, 10 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 0701e91272f..7dcdc33c77f 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1777,12 +1777,16 @@ sub create_profile {
foreach my $key (sort keys %vars) {
$instcols{$key} = 1 if $key=~/^collection/ and $vars{$key}==1;
}
- my $scheme=$tlpdb->get_package($vars{'selected_scheme'});
- if (!defined($scheme)) {
- die ("Scheme $vars{selected_scheme} not defined.\n");
- }
- for my $scheme_content ($scheme->depends) {
- delete($instcols{"$scheme_content"}) if ($scheme_content=~/^collection-/);
+ # for anything but "scheme-custom" we delete the contained
+ # collections from the list
+ if ($vars{'selected_scheme'} ne "scheme-custom") {
+ my $scheme=$tlpdb->get_package($vars{'selected_scheme'});
+ if (!defined($scheme)) {
+ die ("Scheme $vars{selected_scheme} not defined.\n");
+ }
+ for my $scheme_content ($scheme->depends) {
+ delete($instcols{"$scheme_content"}) if ($scheme_content=~/^collection-/);
+ }
}
# if there are still collection left, we keep all of them
my $save_cols = (keys(%instcols) ? 1 : 0);