texlive[54820] Master/tlpkg: tlpkg-ctan-check: avoid catalogue update

commits+karl at tug.org commits+karl at tug.org
Tue Apr 21 00:45:46 CEST 2020


Revision: 54820
          http://tug.org/svn/texlive?view=revision&revision=54820
Author:   karl
Date:     2020-04-21 00:45:46 +0200 (Tue, 21 Apr 2020)
Log Message:
-----------
tlpkg-ctan-check: avoid catalogue update for every package; other doc and syntax tweaks, etc.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/c2l
    trunk/Master/tlpkg/bin/ctan2tl
    trunk/Master/tlpkg/bin/tlpkg-ctan-check
    trunk/Master/tlpkg/bin/tlpkginfo
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/tlpkg/bin/c2l
===================================================================
--- trunk/Master/tlpkg/bin/c2l	2020-04-20 22:22:06 UTC (rev 54819)
+++ trunk/Master/tlpkg/bin/c2l	2020-04-20 22:45:46 UTC (rev 54820)
@@ -103,7 +103,7 @@
   push (@msgs, grep { /^svn: E/ } @lines);              # svn errors
   push (@msgs, grep { /: no hit for pattern/ } @lines); # tlpsrc updates
   # map file changes; should do better, check .tlpsrc for existing ...
-  push (@msgs, grep { /(svn .*|^	)[A-z]*\.map/ } @lines);
+  push (@msgs, grep { /(svn .*|^	)[A-z]*\.map$/ } @lines);
   print map { (/^\*/ ? "" : "*** ") . $_ } @msgs;
   
   if ($status != 0) {

Modified: trunk/Master/tlpkg/bin/ctan2tl
===================================================================
--- trunk/Master/tlpkg/bin/ctan2tl	2020-04-20 22:22:06 UTC (rev 54819)
+++ trunk/Master/tlpkg/bin/ctan2tl	2020-04-20 22:45:46 UTC (rev 54820)
@@ -83,7 +83,7 @@
 if $copy_from_ctan; then
   ctan_dir=`tlpkginfo --prepare $pkg`
 else
-  ctan_dir="$pkg"
+  ctan_dir=$pkg
 fi
 
 if test -z "$ctan_dir"; then

Modified: trunk/Master/tlpkg/bin/tlpkg-ctan-check
===================================================================
--- trunk/Master/tlpkg/bin/tlpkg-ctan-check	2020-04-20 22:22:06 UTC (rev 54819)
+++ trunk/Master/tlpkg/bin/tlpkg-ctan-check	2020-04-20 22:45:46 UTC (rev 54820)
@@ -1013,7 +1013,7 @@
     return 1;
   }
 
-  chomp (my $ctan_dir = `$mydir/tlpkginfo --prepare '$tlpn'`);
+  chomp (my $ctan_dir = `$mydir/tlpkginfo --no-catalogue --prepare '$tlpn'`);
   if (! $ctan_dir) {
     warn "$0: oops, no CTAN directory for $tlpn, fix fix\n";
     return 1;
@@ -1032,7 +1032,7 @@
   # and factor it out from here and ctan2tds.
   if ($tlpn eq "cs") {
     $TMPDIR = $ENV{"TMPDIR"} || "/tmp";
-    my $pkgdir = "$TMPDIR/tl.$pkgname";
+    my $pkgdir = "$TMPDIR/tl.$tlpn";
     system ("rm -rf $pkgdir");
     mkdir ($pkgdir, 0777) || die "mkdir($pkgdir) failed: $!";
     #
@@ -1052,6 +1052,7 @@
   # we don't push bin files.
   my @tl_basefiles = ();  # compare with CTAN after the loop
     
+  my @ctan_files = ();
   my @compared = ();
   for my $file (@tl_files) {
     (my $basefile = $file) =~ s,^.*/,,;
@@ -1091,7 +1092,7 @@
       next;
     }
     
-    chomp (my @ctan_files = `find $ctan_dir/ -name $basefile`);
+    chomp (@ctan_files = `find $ctan_dir/ -name $basefile`);
 #warn "ctan find $basefile: @ctan_files\n";
     # the trailing / is so we dereference a symlink on CTAN.
     next if @ctan_files > 1; # if more than one file by same name, skip
@@ -1154,7 +1155,6 @@
   print ((@compared + 0) . " compared (@compared)\n") if $OPT{"verbose"};
 
   # clean up the tmpdir possibly created from tlpkginfo --prepare.
-  chomp (my $ctan_root = `$mydir/tlpkginfo --ctan-root`);
   if ($ctan_dir !~ m,^$ctan_root, && ! $OPT{"no-clean"}) {
     system ("rm -rf $ctan_dir");
   }

Modified: trunk/Master/tlpkg/bin/tlpkginfo
===================================================================
--- trunk/Master/tlpkg/bin/tlpkginfo	2020-04-20 22:22:06 UTC (rev 54819)
+++ trunk/Master/tlpkg/bin/tlpkginfo	2020-04-20 22:45:46 UTC (rev 54820)
@@ -71,6 +71,7 @@
   -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 ("|",
@@ -92,6 +93,9 @@
     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
@@ -390,7 +394,7 @@
   if ($catfile) {
     # redirect to stderr because we want the only stdout to be the
     # directory name for ctan2tl to use.
-    system ("svn update $catfile >&2");
+    system ("timeout 8s svn update $catfile >&2") if $catalogue_update;
     
     open (CATFILE, "<$catfile") || die "open($catfile) failed, fixme: $!";
     # looking for a line like <install path='...'/>

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2020-04-20 22:22:06 UTC (rev 54819)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2020-04-20 22:45:46 UTC (rev 54820)
@@ -590,7 +590,8 @@
  'hvqrurl',     "&MAKEflatten",
  'hybrid-latex', "die 'skipping, no self-locating of Python modules'",
  'hyph-utf8',   "&MAKEcopy",
- 'hyphen-german',"die 'skipping, part of hyph-utf8'",
+ 'hyphen-german', "die 'skipping, part of hyph-utf8'",
+ 'hyphen-spanish',"die 'skipping, part of hyph-utf8'",
  'ibygrk',      "&MAKEflatten",
  'icon-appr',   "die 'skipping, per author (dps) request'",
  'ieeeconf',    "die 'skipping, use IEEEconf'",



More information about the tex-live-commits mailing list.