summaryrefslogtreecommitdiff
path: root/Master/install-tl.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-01-14 14:30:19 +0000
committerNorbert Preining <preining@logic.at>2008-01-14 14:30:19 +0000
commite1c94789177b5a9dc0885aaac29a3b0d0277d8bb (patch)
tree03b7e20bc467e93d423fe689b28f8d3755a7af79 /Master/install-tl.pl
parent589f4c6057ba0e65f646bedb05d7a0510795475e (diff)
make "Cancel" actually work as a cancel, instead of what it was before,
namely a wrongly named and incomplete "Return" ;-) git-svn-id: svn://tug.org/texlive/trunk@6227 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-xMaster/install-tl.pl16
1 files changed, 13 insertions, 3 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 47e35dd7a41..92b1d91888b 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -320,11 +320,17 @@ sub do_installation {
sub dump_vars {
my $filename=shift;
- open VARS, ">$filename";
+ my $fh;
+ if (ref($filename)) {
+ $fh = $filename;
+ } else {
+ open VARS, ">$filename";
+ $fh = \*VARS;
+ }
foreach my $key (keys %vars) {
- print VARS "$key $vars{$key}\n";
+ print $fh "$key $vars{$key}\n";
}
- close VARS;
+ close VARS if (!ref($filename));
tllog($::LOG_DEBUG, "\n%vars dumped to '$filename'.\n");
}
@@ -402,6 +408,10 @@ sub calc_depends {
# First look for packages in the selected scheme.
my $scheme=$tlpdb->get_package($vars{'selected_scheme'});
+ if (!defined($scheme)) {
+ dump_vars(\*STDOUT);
+ die ("Scheme $vars{'selected_scheme'} not defined!\n");
+ }
for my $scheme_content ($scheme->depends) {
$install{"$scheme_content"}=1 unless ($scheme_content=~/^collection-/);