summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-01-21 19:31:28 +0000
committerKarl Berry <karl@freefriends.org>2009-01-21 19:31:28 +0000
commite877301bd87aeff9377f5f96b9a3698e7617dfae (patch)
treed27c54a65658d5e7b60422c82d80376df959c878 /Master
parentfc5b68d1ee39263ba3d73c51113a465a2483d9e8 (diff)
do not update tex4ht, tar backup fails
git-svn-id: svn://tug.org/texlive/trunk@11940 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers18
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet4
-rw-r--r--Master/tlpkg/etc/tlnet-disabled-packages.txt16
3 files changed, 28 insertions, 10 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 3bb67458355..56a62be6dbb 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# Copyright 2008 Norbert Preining
+# Copyright 2008, 2009 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -120,13 +120,15 @@ sub main
for my $pkg (@packs) {
# by definition, any 00texlive... package does not need containers.
next if $pkg =~ /00texlive/;
- # we check for the existence of Master/tlpkg/disabled-packages-for-tlnet
- # and if it is present any package listed therein will not be
- # updated in tlnet
- if (-r "$Master/tlpkg/disabled-packages-for-tlnet") {
- if (!system("grep", "-q", $pkg, "Master/tlpkg/disabled-packages-for-tlnet")) {
- tlwarn("$pkg disabled for tlnet updates (tlpkg/disabled-packages-for-tlnet)\n");
- next,
+
+ # 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/etc/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");
+ next;
}
}
my $oldrev = 0;
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 78d4fcc442d..1a41479ae14 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# Copyright 2008 Norbert Preining
+# Copyright 2008, 2009 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -23,7 +23,7 @@ while test $# -gt 0; do
--critical) critical=--all;;
--dry-run|-n) chicken=true;;
--master) shift; Master=$1;;
- --no-testinstall|-N) do_testinstall=false;;
+ --no-testinstall|-N) do_testinstall=false;; # and no updates; quit early.
--recreate) recreate=--recreate;;
--testlocation) shift; tltrybase=$1;;
-v|-vv|-vvv) verbose=$1;;
diff --git a/Master/tlpkg/etc/tlnet-disabled-packages.txt b/Master/tlpkg/etc/tlnet-disabled-packages.txt
new file mode 100644
index 00000000000..c1a95ad94fb
--- /dev/null
+++ b/Master/tlpkg/etc/tlnet-disabled-packages.txt
@@ -0,0 +1,16 @@
+tex4ht
+tex4ht.alpha-linux
+tex4ht.amd64-freebsd
+tex4ht.hppa-hpux
+tex4ht.i386-freebsd
+tex4ht.i386-linux
+tex4ht.i386-openbsd
+tex4ht.i386-solaris
+tex4ht.mips-irix
+tex4ht.powerpc-aix
+tex4ht.powerpc-linux
+tex4ht.sparc-linux
+tex4ht.sparc-solaris
+tex4ht.universal-darwin
+tex4ht.win32
+tex4ht.x86_64-linux