summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-18 00:58:41 +0000
committerKarl Berry <karl@freefriends.org>2008-11-18 00:58:41 +0000
commit9333748b5b1c858f157072c5a7845e1eac780350 (patch)
tree3a0a79d38558c043ec959869e670605a67abd061
parentc74d68ee64328c552d23aae43da7aa496637f257 (diff)
more information when dying
git-svn-id: svn://tug.org/texlive/trunk@11340 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl6
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm1
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm8
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm3
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm4
8 files changed, 15 insertions, 17 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index f8c9f5a5bf0..30ce479064b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1189,9 +1189,9 @@ sub action_update {
$forcermpkgs{$p} = 1;
}
}
- debug ("tlmgr: newpkg: " . join("\n\t",keys %newpkgs) . "\n");
- debug ("tlmgr: rempkg: " . join("\n\t",keys %removals) . "\n");
- debug ("tlmgr: forpkg: " . join("\n\t",keys %forcermpkgs) . "\n");
+ debug ("tlmgr: new pkgs: " . join("\n\t",keys %newpkgs) . "\n");
+ debug ("tlmgr: deleted : " . join("\n\t",keys %removals) . "\n");
+ debug ("tlmgr: forced : " . join("\n\t",keys %forcermpkgs) . "\n");
if ($opt_all || $opt_list) {
@todo = $localtlpdb->list_packages;
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index 276fa70509f..d29e82287f5 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -149,7 +149,6 @@ sub install_package {
} elsif (-r "$location/$Archive/$pkg.tar.lzma") {
$container = "$location/$Archive/$pkg.tar.lzma";
} else {
- # for now only warn and return, should (?) be die!?
tlwarn("Cannot find a package $pkg (.zip or .lzma) in $location/$Archive\n");
next;
}
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 5d26e831b6b..a7ab0bb2838 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -194,7 +194,7 @@ It returns the actual number of packages (TLPOBJs) read from C<$filename>.
sub from_file {
my ($self, $path) = @_;
if (@_ != 2) {
- die("Need a filename for initialization!");
+ die "need filename for initialization";
}
my $root_from_path = dirname(dirname($path));
if (defined($self->{'root'})) {
@@ -396,9 +396,9 @@ sub _add_tlpcontainer {
$container .= ".lzma";
$unpackprog="NO_IDEA_HOW_TO_UNPACK_LZMA";
$args="NO IDEA WHAT ARGS IT NEEDS";
- die("lzma is checked for but not implemented, please edit TLPDB.pm\n");
+ die "lzma checked for but not implemented, maybe update TLPDB.pm\n";
} else {
- die "Cannot find a package $container (.zip or .lzma) in $ziplocation\n";
+ die "Cannot find package $container (.zip or .lzma) in $ziplocation\n";
}
tlwarn("Huuu, this needs testing and error checking!\n");
tlwarn("Should we use -a -- adapt line endings etc?\n");
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 381e4ae5e03..c56266d8c8c 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -59,7 +59,7 @@ sub copy {
sub from_file {
my $self = shift;
if (@_ != 1) {
- die("Need a filename for initialization!");
+ die("TLPOBJ:from_file: Need a filename for initialization");
}
open(TMP,"<$_[0]") || die("Cannot open tlpobj file: $_[0]");
$self->from_fh(\*TMP);
@@ -516,7 +516,7 @@ sub writeout_simple {
sub make_container {
my ($self,$type,$instroot,$destdir,$containername,$relative) = @_;
if (($type ne "lzma") && ($type ne "tar")) {
- die("TLPOBJ currently supports only plain or lzma containers");
+ die "TLPOBJ currently supports only plain or lzma containers, not $type";
}
if (!defined($containername)) {
$containername = $self->name;
@@ -540,7 +540,7 @@ sub make_container {
my $tmp;
($tmp) = split m@/@;
if (defined($tltree) && ($tltree ne $tmp)) {
- die "Not generating relative package for multiple tree spanning packages!\n";
+ die "Not generating relative package for multiple tree spanning packages\n";
} else {
$tltree = $tmp;
}
@@ -857,7 +857,7 @@ sub make_return_hash_from_executes {
my $self = shift;
my $type = shift;
if (!defined($type) || (($type ne "enable") && ($type ne "disable"))) {
- die "type for make_return_hash_from_executes must be either enable or disable";
+ die "make_return_hash_from_executes: enable or disable, not type $type";
}
my %ret;
my (@maps, @formats, @dats);
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index e21d938b6c9..e30fb750521 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -41,7 +41,7 @@ sub new
sub from_file
{
my $self = shift;
- die("Need exactly one filename for initialization!") if @_ != 1;
+ die "need exactly one filename for initialization" if @_ != 1;
my $srcfile = $_[0];
if (! -r "$srcfile") {
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index d3af63e1a27..5f47771e712 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -36,7 +36,7 @@ sub init_from_svn {
sub init_from_statusfile {
my $self = shift;
- die "need a filename of svn status file" if (@_ != 1);
+ die "need filename of svn status file" if (@_ != 1);
open(TMP,"<$_[0]") || die "open of svn status file($_[0]) failed: $!";
my @lines = <TMP>;
close(TMP);
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 76d32d30106..4edd1f0472b 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -884,7 +884,6 @@ sub install_packages {
} elsif (-r "$root/$Archive/$package.tar.lzma") {
$container = "$root/$Archive/$package.tar.lzma";
} else {
- # for now only warn and return, should (?) be die!?
tlwarn("Cannot find a package $package (.zip or .lzma) in $root/$Archive\n");
next;
}
@@ -978,7 +977,7 @@ sub install_package {
my $wget = $::progs{'wget'};
my $lzmadec = $::progs{'lzmadec'};
if (!defined($wget) || !defined($lzmadec)) {
- die "install_package: programs not set up properly, strange";
+ die "install_package: wget/lzmadec programs not set up properly, strange";
}
if (ref $what) {
# we are getting a ref to a list of files, so install from DVD
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 3df12deea97..f3fab1c4992 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -407,7 +407,7 @@ sub setenv_reg {
my $env_var = shift;
my $env_data = shift;
my $mode = @_ ? shift : "default";
- die "setenv_reg: Invalid mode"
+ die "setenv_reg: Invalid mode $mode"
if ($mode ne "user" and $mode ne "system" and $mode ne "default");
die "setenv_reg: mode 'system' only available for admin"
if ($mode eq "system" and !$is_admin);
@@ -439,7 +439,7 @@ sub unsetenv_reg {
my $env = get_user_env();
my $mode = @_ ? shift : "default";
#print "Unsetenv_reg: unset $env_var with mode $mode\n";
- die "unsetenv_reg: Invalid mode"
+ die "unsetenv_reg: Invalid mode $mode"
if ($mode ne "user" and $mode ne "system" and $mode ne "default");
die "unsetenv_reg: mode 'system' only available for admin"
if ($mode eq "system" and !$is_admin);