summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin/tl-update-containers
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-11-20 12:17:40 +0000
committerNorbert Preining <preining@logic.at>2008-11-20 12:17:40 +0000
commit61732a28f0e73ff1347ecca3c03130a195dc5c01 (patch)
tree38281f8ca362dcb4c4a577e72db567a0bf881d7a /Master/tlpkg/bin/tl-update-containers
parentc9e4b2533d16de51546cc65fead90be3ff27ffc5 (diff)
tl-update-containers: always add 00texlive.config and 00texlive-installation.config to the container tlpdb.
git-svn-id: svn://tug.org/texlive/trunk@11370 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-containers')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers16
1 files changed, 10 insertions, 6 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index d1d68bbb2ed..1bb87bfc8a6 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -93,10 +93,6 @@ sub main
@todopacks = @packs;
$nettlpdb = TeXLive::TLPDB->new;
die "cannot create new tlpdb" unless defined($nettlpdb);
- # we have to copy 00texlive.config to the new tlpdb otherwise
- # the configuration gets lost ...
- my $tlpconfig = $tlpdb->get_package("00texlive.config");
- $nettlpdb->add_tlpobj($tlpconfig);
} else {
@todopacks = $tlpdb->list_packages;
$nettlpdb = $tlpdb->copy;
@@ -122,7 +118,7 @@ sub main
for my $pkg (@packs) {
# by definition, any 00texlive... package does not need containers.
- next if $pkg =~ /00texlive.*\./;
+ next if $pkg =~ /00texlive/;
my $oldrev = 0;
if (-r "$opt_containerdir/$pkg.tar.$type"
&& defined($archiverevs{$pkg})) {
@@ -168,6 +164,14 @@ sub main
}
}
}
+
+ # The two packages 00texlive.config and 00texlive-installation.config
+ # are essential and have to be included in each and every case.
+ # So add them ...
+ my $tlpconfig = $tlpdb->get_package("00texlive.config");
+ $nettlpdb->add_tlpobj($tlpconfig);
+ my $tlpinstconfig = $tlpdb->get_package("00texlive-installation.config");
+ $nettlpdb->add_tlpobj($tlpinstconfig);
# set up the programs.
if ($opt_nosetup) {
@@ -189,7 +193,7 @@ sub main
# get list of packages.
PACKS: for my $pkg (sort @todopacks) {
- next if $pkg =~ /^00texlive\.(config|installer)$/;
+ next if $pkg =~ /00texlive/;
foreach my $manualpkgre (@critical_pkg_list) {
# we match the initial string of the package name, so that all the
# .arch packages are skipped, too