diff options
author | Norbert Preining <preining@logic.at> | 2010-05-17 02:10:56 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2010-05-17 02:10:56 +0000 |
commit | 4eb343fe6ec0cfe6e868ea717e604b65e795dcb9 (patch) | |
tree | e0fc54c14dc91278bc84e4b78e2fc4582d497596 /Master/tlpkg/bin/tl-update-tlpdb | |
parent | 2fe2a2ad57334001b2bd5abb4cb0e8cafcc8343a (diff) |
add -tlpdb-options-from-tlpsrc to tl-update-tlpdb and document everything
in repository-setup.txt
git-svn-id: svn://tug.org/texlive/trunk@18296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-tlpdb')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlpdb | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb index 0f08c73ef52..ba83d0ca7e6 100755 --- a/Master/tlpkg/bin/tl-update-tlpdb +++ b/Master/tlpkg/bin/tl-update-tlpdb @@ -2,7 +2,7 @@ # $Id$ # convert a set of tlpsrc files (given as arguments) into tlpdb # -# Copyright 2007, 2008, 2009 Norbert Preining +# Copyright 2007, 2008, 2009, 2010 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -37,6 +37,7 @@ my $opt_output; my $opt_save_anyway = 0; my $opt_tlpsrc_from_cmdline = 0; my $opt_w32warning; +my $opt_tlpdb_options_from_tlpsrc = 0; TeXLive::TLUtils::process_logging_options(); GetOptions( @@ -52,6 +53,7 @@ GetOptions( "save-anyway!" => \$opt_save_anyway, "tlpsrc-from-cmdline" => \$opt_tlpsrc_from_cmdline, "with-w32-pattern-warning" => \$opt_w32warning, + "tlpdb-options-from-tlpsrc" => \$opt_tlpdb_options_from_tlpsrc, "help|?" => \$help) or pod2usage(1); pod2usage(-exitstatus => 0, -verbose => 2) if $help; @@ -312,13 +314,18 @@ sub create_tlpdb $found_texlive_installation = 1; } if ($tlp->name eq "00texlive.config") { - my @bar = $tlp->depends; - for my $k (sort keys %TeXLive::TLConfig::TLPDBConfigs) { - push @bar, "$k/" . $TeXLive::TLConfig::TLPDBConfigs{$k}; + # in original TL we set the options in TLConfig, but local repositories + # might want to set them in the .tlpsrc file, so give them the option + # to do so + if (!$opt_tlpdb_options_from_tlpsrc) { + my @bar = $tlp->depends; + for my $k (sort keys %TeXLive::TLConfig::TLPDBConfigs) { + push @bar, "$k/" . $TeXLive::TLConfig::TLPDBConfigs{$k}; + } + # add the latest revision + push @bar, "revision/".$tltree->revision; + $tlp->depends (@bar); } - # add the latest revision - push @bar, "revision/".$tltree->revision; - $tlp->depends (@bar); } $tldb->add_tlpobj ($tlp); } @@ -443,6 +450,14 @@ file, with the exception that it does I<not> warn for binpatterns when working on the win32 architecture. Giving this option makes it issue all warnings, i.e., also those where a binpattern on win32 does not hit. +=item B<-tlpdb-options-from-tlpsrc> + +By default the tlpdb specific settings in 00texlive.config are taken from +the C<%TeXLive::TLConfig::TLPDBConfigs>. Alternative repositories might +set these values directly in the tlpsrc file. Using +B<-tlpdb-options-from-tlpsrc> overrides the default behaviour and does +not add anything to the configs set in the tlpsrc file. + =back The standard options C<-q>, C<-v>, and C<-logfile>=I<file> are also |