texlive[49856] Master/install-tl: (read_profile): abort if value

commits+karl at tug.org commits+karl at tug.org
Mon Jan 28 23:54:16 CET 2019


Revision: 49856
          http://tug.org/svn/texlive?view=revision&revision=49856
Author:   karl
Date:     2019-01-28 23:54:16 +0100 (Mon, 28 Jan 2019)
Log Message:
-----------
(read_profile): abort if value missing from
required keys.

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

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2019-01-28 22:47:02 UTC (rev 49855)
+++ trunk/Master/install-tl	2019-01-28 22:54:16 UTC (rev 49856)
@@ -2015,9 +2015,7 @@
         $vars{$_} = $pro{$_};
         delete($pro{$_});
       }
-      next;
-    }
-    if (m/^tlpdbopt_/) {
+    } elsif (m/^tlpdbopt_/) {
       my $o = $_;
       $o =~ s/^tlpdbopt_//;
       # we do not support setting the location in the profile
@@ -2027,15 +2025,14 @@
         $vars{$_} = $pro{$_};
         delete($pro{$_});
       }
-      next;
-    }
-    if (defined($path_keys{$_}) || 
-        m/^selected_scheme$/    ||
-        m/^binary_/             ||
-        m/^collection-/) {
-      $vars{$_} = $pro{$_};
+    } elsif (defined($path_keys{$_})
+             || m/^(selected_scheme$|binary|collection-)/) {
+      if ($pro{$_}) {
+        $vars{$_} = $pro{$_};
+      } else {
+        tldie("$0: Profile key must not be empty, quitting: $_\n");
+      }
       delete($pro{$_});
-      next;
     }
   }
   #require Data::Dumper;



More information about the tex-live-commits mailing list