use envvar instead of option to avoid catalogue update of every file with tlpkg-ctan-check --check; bump bad-mirror threshold to 36 hours

git-svn-id: svn://tug.org/texlive/trunk@54909 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 8 insertions, 8 deletions

diff --git a/Master/tlpkg/bin/tl-update-ctan-mirrors b/Master/tlpkg/bin/tl-update-ctan-mirrors
index d7b7cfcea34..005e8fe3755 100755
--- a/Master/tlpkg/bin/tl-update-ctan-mirrors
+++ b/Master/tlpkg/bin/tl-update-ctan-mirrors
@@ -59,7 +59,7 @@ sub read_mstate {
     } else {
       # mirrors can be stale and yet not have no_time for their status.
       my $age_hours = (time() - $age) / (60 * 60);
-      if ($age_hours > 24) {
+      if ($age_hours > 36) {
         printf STDERR "mirror age %.1f hours, skipping: $m\n", $age_hours
           if $verbose;
       } else {
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 846770cc472..f736a840d14 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -1015,7 +1015,9 @@ sub do_tlp {
     return 1;
   }
 
-  chomp (my $ctan_dir = `$mydir/tlpkginfo --no-catalogue --prepare '$tlpn'`);
+  # don't want to run svn update individually for every catalogue file.
+  my $env = "env TLPKGINFO_CATALOGUE_NO_UPDATE=1";
+  chomp (my $ctan_dir = `$env $mydir/tlpkginfo --prepare '$tlpn'`);
   if (! $ctan_dir) {
     warn "$0: oops, no CTAN directory for $tlpn, fix fix\n";
     return 1;
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 92335ba455d..f48e2e78b80 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -71,7 +71,6 @@ sub ctaninfo {
   -d "$CATALOGUE/k"
     || die "$0: TEX_CATALOGUE ($CATALOGUE) must point to entries/ subdir"
            . " of a TeX Catalogue checkout.\n";
-  $catalogue_update = 1; # do svn update of catalogue file?
   
   # erroneous or problematic tds files (when new, tell CTAN and author)
   $erroneous_tds = join ("|",
@@ -93,9 +92,6 @@ sub ctaninfo {
     print "$output\n" if $output;
     return $output ? 0 : 1;
 
-  } elsif ($ARGV[0] eq "--no-catalogue") {
-    $catalogue_update = 0;
-
   } elsif ($ARGV[0] eq "--prepare") {
     my $output = &prepare ($ARGV[1]);
     print "$output\n" if $output;  # if no $output, errors elsewhere
@@ -393,8 +389,10 @@ sub prepare {
   my $catfile = &catalogue_find_file ($catname || $pkg);
   if ($catfile) {
     # redirect to stderr because we want the only stdout to be the
-    # directory name for ctan2tl to use.
-    system ("timeout 10s svn update $catfile >&2") if $catalogue_update;
+    # directory name for ctan2tl to use. Intentionally do not use -q
+    # so that we have a chance of noticing errors.
+    system ("timeout 10s svn update $catfile >&2")
+      unless $ENV{"TLPKGINFO_CATALOGUE_NO_UPDATE"};
     
     open (CATFILE, "<$catfile") || die "open($catfile) failed, fixme: $!";
     # looking for a line like <install path='...'/>