texlive[44400] Master/install-tl: fix breakage at and of installation

[commits+preining at tug.org]

Revision: 44400
          http://tug.org/svn/texlive?view=revision&revision=44400
Author:   preining
Date:     2017-05-18 04:20:12 +0200 (Thu, 18 May 2017)
Log Message:
-----------
fix breakage at and of installation when selecting custom collections (scheme-custom)

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2017-05-18 00:21:57 UTC (rev 44399)
+++ trunk/Master/install-tl	2017-05-18 02:20:12 UTC (rev 44400)
@@ -1777,13 +1777,17 @@
   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 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-/);
+    }
   }
-  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);