summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin/tl-update-containers
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-04-23 04:20:08 +0000
committerNorbert Preining <preining@logic.at>2012-04-23 04:20:08 +0000
commitfd629364cb783750f56b0e3f316dc0eda90b5493 (patch)
tree57f6bf2a25166c706f13b694feea0e791a750070 /Master/tlpkg/bin/tl-update-containers
parenta5c112213bcbf0fd501f286be0ad43d945af72aa (diff)
make sure that a tlnet disabled package is always ignored,
and rebuild in tlcritical git-svn-id: svn://tug.org/texlive/trunk@26100 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-containers')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers19
1 files changed, 12 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index be0e3836e0b..6f96d00996e 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -89,6 +89,9 @@ sub main
my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::Archive";
&debug("output containerdir = $opt_containerdir\n");
+ my @disabled_pkgs = TeXLive::TLUtils::tlnet_disabled_packages($Master);
+ print "additional tlnet disabled packages: @disabled_pkgs\n";
+
if ($opt_recreate) {
# remake everything.
if (@ARGV) {
@@ -122,13 +125,15 @@ sub main
# by definition, any 00texlive... package does not need containers.
next if $pkg =~ /00texlive/;
- # we check for the existence of a special config file, and if it
- # is present any package listed therein will not be updated in
- # tlnet. Assume GNU grep for checking it.
- my $disabled_pkgs = "$Master/tlpkg/dev/tlnet-disabled-packages.txt";
- if (-r $disabled_pkgs) {
- if (!system("grep", "-q", "-x", "-F", $pkg, $disabled_pkgs)) {
- tlwarn("$0: $pkg disabled for tlnet updates in $disabled_pkgs\n");
+ # disable all packages (ignoring .ARCH parts) if they appear in
+ # tlnet-disabled-packages.txt
+ my $shortpkg = $pkg;
+ $shortpkg =~ s/\..*$//;
+ if (TeXLive::TLUtils::member($shortpkg, @disabled_pkgs)) {
+ if ($opt_all || $opt_recreate) {
+ tlwarn("$0: Updating tlnet disabled $pkg due to -all\n");
+ } else {
+ tlwarn("$0: $pkg disabled for tlnet updates\n");
next;
}
}