diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlpdb | 32 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tltestnet | 1 |
2 files changed, 23 insertions, 10 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb index a43baa6e08e..987cdadeb67 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-2018 Norbert Preining +# Copyright 2007-2019 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -486,7 +486,14 @@ tlpsrc file to artificially increase its version number. =item B<--from-files> -Use C<find> instead of C<svn -status> to create the list of files. +=item B<--from-git> + +=item B<--from-gitsvn> + +Use C<find>, C<git>, and git-over-svn, respectively, instead of C<svn +-status> to create the list of files. This amounts to calling the +respective function in L<TeXLive::TLTree> to initialize the tree of +files. By default, Subversion is used. =item B<--master> I<Master_dir> @@ -516,7 +523,7 @@ tlpsrc directory. With this option the commit step is skipped. By default, C<tl-update-tlpdb> checks that in the generated tlpdb the revision numbers of packages are not going backward compared to the -previous version. This option disables this check. +current tlpdb (see below). This option disables this check. =item B<--output=filename> @@ -559,16 +566,21 @@ L<TeXLive::TLUtils> for details. C<tl-update-tlpdb> converts TeX Live source package files (tlpsrc) files into a TeX Live package database (tlpdb). -In addition if at the same location there is already a TLPDB, it +By default, it looks at Subversion output to determine the files in the +current tree to place into the tlpdb. With the C<--from-files> option, +it reads the filesystem with C<find>, and analogously for C<--from-git> +and C<--from-gitsvn>. + +In addition, if at the same location there is already a tlpdb, it compares the revision number of packages and checks if a package is -going back in time (i.e., having a smaller revision number in the new -tlpdb). This can happen when a file is removed and no other changes -made. In this case it commits a dummy change to the package's tlpsrc -file to make sure that revisions are always increasing. +going back in time (i.e., has a smaller revision number in the new +tlpdb). This can happen when a file is removed and no other changes to +the package made. In this case it commits a dummy change to the +package's tlpsrc file to make sure that revisions are always increasing. +The check is omitted if C<--no-reverse-revision-check> is specified. If a TeX Catalogue hierarchy is specified, additional information from -the Catalogue is merged into the database (see L<TeXLive::TLPOBJ> for -the specifics). +the Catalogue is merged into the database (see L<TeXLive::TLPOBJ>). =head1 AUTHORS AND COPYRIGHT diff --git a/Master/tlpkg/bin/tltestnet b/Master/tlpkg/bin/tltestnet index 68224845c0f..0fa0d1d77c7 100755 --- a/Master/tlpkg/bin/tltestnet +++ b/Master/tlpkg/bin/tltestnet @@ -49,6 +49,7 @@ elif test "x$1" = x-i; then elif test "x$1" = x--rebuild; then # update test repository. Do -s first to put code in place, and -S after. destdir=/home/ftp/texlive/test-tlnet + set -x tl-update-tlnet --critical --scheme infraonly --dest $destdir tl-update-tlcritical --tlcrit $destdir --no-containers |