summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm10
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers6
2 files changed, 8 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 38aca49906a..5b985616582 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -174,7 +174,7 @@ sub remove_package {
if (defined($self->{'tlps'}{$pkg})) {
delete $self->{'tlps'}{$pkg};
} else {
- tlwarn("Cannot find package $pkg for removal in tlpdb!");
+ tlwarn("TLPDB: package to be removed not found: $pkg\n");
}
}
@@ -672,7 +672,7 @@ sub _generate_listfile {
} else {
# speudo dependencies on $Package.ARCH can be ignored
if ($d !~ m/\.ARCH$/) {
- tlwarn("Strange: $tlp->name depends on $d, but this package does not exists!\n");
+ tlwarn("TLPDB: package $tlp->name depends on $d, but this does not exist\n");
}
}
}
@@ -691,7 +691,7 @@ sub _generate_listfile {
foreach my $p (@lop) {
my $subtlp = $self->get_package($p);
if (!defined($subtlp)) {
- tlwarn("Strange: $listname references $p, but it is not in tlpdb");
+ tlwarn("TLPDB: $listname references $p, but it is not in tlpdb\n");
}
$s += $subtlp->total_size;
}
@@ -720,7 +720,7 @@ sub _generate_listfile {
TeXLive::TLUtils::push_uniq(\@collpkg,$d);
}
} else {
- tlwarn("Strange: $coll->name depends on $d, but this does not exists!\n");
+ tlwarn("TLPDB: collection $coll->name depends on $d, but this does not exist\n");
}
}
}
@@ -1038,7 +1038,7 @@ sub fmtutil_cnf_lines {
my @formatlines;
foreach my $f (sort keys %fmtcnffiles) {
open(INFILE,"<$self->{'root'}/texmf/fmtutil/format.$f.cnf")
- or tlwarn("Cannot open $self->{'root'}/texmf/fmtutil/format.$f.cnf\nThe generated fmtutil.cnf file might be incomplete!\nError: $!\n");
+ or tlwarn("Cannot open $self->{'root'}/texmf/fmtutil/format.$f.cnf\nThe generated fmtutil.cnf file might be incomplete.\nError: $!\n");
@tmp = <INFILE>;
close(INFILE);
push @formatlines, @tmp;
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 1d66aa5d1be..b9d9db9a9ae 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -128,7 +128,7 @@ sub main
&& defined($archiverevs{$pkg})) {
$oldrev = $archiverevs{$pkg};
} else {
- info("$pkg is new\n");
+ info("$0: $pkg is new\n");
$count{"new"}++;
}
@@ -149,7 +149,7 @@ sub main
if (($tlp->runfiles && ! -r "$opt_containerdir/$pkg.tar.$type") ||
($srcsplit && $tlp->srcfiles && ! -r "$opt_containerdir/$pkg.source.tar.$type") ||
($docsplit && $tlp->docfiles && ! -r "$opt_containerdir/$pkg.doc.tar.$type")) {
- info("container(s) for $pkg have disappeared, recreating them.\n");
+ info("$0: container(s) for $pkg have disappeared, recreating them.\n");
push @todopacks, $pkg;
$count{"updated"}++;
} else {
@@ -301,7 +301,7 @@ sub main
}
}
}
- info("$op has disappeared, removing its containers\n");
+ info("$0: $op has disappeared, removing its containers\n");
`rm $opt_containerdir/$op.*` unless $opt_dry;
$nettlpdb->remove_package($op) unless $opt_dry;
$count{"removed"}++;