summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-13 23:58:48 +0000
committerKarl Berry <karl@freefriends.org>2011-09-13 23:58:48 +0000
commit582227ed022c3ea5efe93263d5da23745ce8384c (patch)
treec8a03fea73f3c09e9624d02a88122819879fed07 /Master
parent8cf5e8fc33b56604d7e7e800798539760371f6ce (diff)
keep mirror name in sync, quiet update process
git-svn-id: svn://tug.org/texlive/trunk@23942 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-ctan-mirrors5
2 files changed, 6 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index a48be70c32d..6908d0133da 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -253,12 +253,12 @@ fi # !config_scripts_only
if $config_scripts_only; then :; else
ctan_mirrors=$TMPDIR/mirrors # incoming data from CTAN
ctan_mirmon=$TMPDIR/mirmon.state
-mirrors4tl=tlpkg/installer/ctan_mirrors.pl # massaged for TL
+mirrors4tl=tlpkg/installer/ctan-mirrors.pl # massaged for TL
if wget --quiet http://ctan.org/mirrors -O $ctan_mirrors \
&& rsync rsync://comedy.dante.de/MirMon/mirmon.state $ctan_mirmon; then
$mydir/tl-update-ctan-mirrors $ctan_mirrors $ctan_mirmon >$mirrors_4tl.new
- if $diff $mirrors4tl.new $mirrors4tl; then
+ if $diff $mirrors4tl $mirrors4tl.new; then
$verbose " $mirrors4tl ok."
else
$chicken $cp $mirrors4tl.new $mirrors4tl
diff --git a/Master/tlpkg/bin/tl-update-ctan-mirrors b/Master/tlpkg/bin/tl-update-ctan-mirrors
index dab267967ba..88f7fdb76ee 100755
--- a/Master/tlpkg/bin/tl-update-ctan-mirrors
+++ b/Master/tlpkg/bin/tl-update-ctan-mirrors
@@ -117,6 +117,9 @@ sub add_mirror {
printf STDERR "$0: mirror seems to be dead, skipped: $url\n";
}
} else {
- printf STDERR "$0: mirror not in mirmon file, skipped: $url\n";
+ # CTAN people leave out ftp/rsync, and intentionally let the
+ # CTAN.sites file stay unchanged even when something is removed from
+ # mirmon, on occasion. So don't complain about it.
+ #printf STDERR "$0: mirror not in mirmon file, skipped: $url\n";
}
}