summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-04 17:17:09 +0000
committerKarl Berry <karl@freefriends.org>2008-07-04 17:17:09 +0000
commit72165bd1c3bac6eaf99af8bae06b70f91899596e (patch)
treeb400fbe54a2294ce0bc5582fea2743611e203106 /Master
parent4a538ec380cd2f24d4e13675ce50ff193001436b (diff)
complain if .tlpsrc filename does not match
package name. git-svn-id: svn://tug.org/texlive/trunk@9246 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/tlpsrc2tlpdb34
1 files changed, 19 insertions, 15 deletions
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index 784f030ade5..a61ddd303ca 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -72,39 +72,43 @@ sub main
my $tldb = TeXLive::TLPDB->new;
my $src_count = 0;
foreach my $f (@ARGV) {
- if ($opt_all) { # progress report
- $src_count++;
- }
+ $src_count++ if $opt_all;
+
my $tlsrc = new TeXLive::TLPSRC;
$tlsrc->from_file ($f);
my $tlp = $tlsrc->make_tlpobj ($tltree);
+ warn "$f.tlpsrc: package name " . $tlp->name . " does not match filename\n"
+ if $tlp->name ne $f;
+
if ($tlc) {
# merge TeX Catalogue information
$tlp->update_from_catalogue ($tlc);
}
- # split bin packages off
- if (not($opt_nobinsplit)) {
+ # split bin packages off unless requested otherwise (no reason to so
+ # request these days).
+ unless ($opt_nobinsplit) {
# packages which have already a .win32 extension or the
# 00texlive.something package are NOT split, never!
- if ( ($tlp->name !~ m/\.win32/) && ($tlp->name !~ m/^00texlive\./) ) {
+ if ($tlp->name !~ m/\.win32/
+ && $tlp->name !~ m/^00texlive\./) {
my @binobjs = $tlp->split_bin_package;
foreach my $binobj (@binobjs) {
# we recompute the revision numbers of the binary packages
# since that might be much smaller, and we don't want to
# update every package only because one binary for one arch
# was changed
- $binobj->revision(0);
+ $binobj->revision (0);
$binobj->recompute_revision ($tltree, $tltree->file_svn_lastrevision("tlpkg/tlpsrc/$f"));
- $tldb->add_tlpobj($binobj);
+ $tldb->add_tlpobj ($binobj);
}
}
}
if ($tlp->name eq "00texlive.config") {
my @bar = $tlp->depends;
push @bar, "revision/".$tltree->revision;
- $tlp->depends(@bar);
+ $tlp->depends (@bar);
}
$tldb->add_tlpobj ($tlp);
}
@@ -145,17 +149,17 @@ live database in C<Master/tlpkg/texlive.tlpdb>.
=item B<-catalogue> I<Catalogue_dir>
The location given by B<-catalogue> must point to a valid TeX Catalogue.
-No default value. If given, the generated tlpobj files will contain information
-gathered from the TeX Catalogue.
+No default value. If given, the generated tlpobj files will contain
+information gathered from the TeX Catalogue.
-=item B<-master> I<Master_dir>
-The location given by B<-master> must point to a valid svn repository
-of TeX Live's Master direcory. Defaults to C<../..> of C<$0>.
+=item B<-master> I<Master/dir>
+The location I<Master/dir> must point to a valid svn repository of TeX
+Live's Master directory. Defaults to C<../..> of C<$0>.
=item B<-no-bin-split>
Do NOT split files with binaries into several packages (one for the arch
independent and one for each of the architectures with only the respective
-binaries).
+binaries). There is no reason to use this option.
=back