diff options
author | Karl Berry <karl@freefriends.org> | 2023-10-29 20:39:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-10-29 20:39:37 +0000 |
commit | cae95bf754f7bdfcc082c5909f4f8c782c3a110a (patch) | |
tree | 6551a8fd2bc1d1b80dfe3644d05e8e9df3899337 /Master/tlpkg | |
parent | 97e544fd6c37d818dc7abc63ec40612a44a1e525 (diff) |
context-collating-marks correct in catalogue now
git-svn-id: svn://tug.org/texlive/trunk@68696 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tlpkginfo | 5 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/context-collating-marks.tlpsrc | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 252cd9aedbc..324d01a3089 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -269,7 +269,7 @@ sub find_ctan_dir { # sub tlpsrc_find_catalogue { my ($me) = @_; - + chomp (my $mydir = `dirname $0`); chomp (my $tlpsrcdir = `cd $mydir/../tlpsrc && /bin/pwd`); my $tlpsrc = "$tlpsrcdir/$me.tlpsrc"; @@ -282,6 +282,7 @@ sub tlpsrc_find_catalogue { if ($cat =~ /\./) { warn "$0: $tlpsrc catalogue value should not contain a period: $cat\n"; } + #warn "tlpsrc_find_catalogue value = $cat\n"; return $cat; } @@ -294,6 +295,7 @@ sub catalogue_find_file { # Happily, the Catalogue uses all-lowercase file/directory names. my $firstchar = substr (lc ($pkgname), 0, 1); my $catfile = "$CATALOGUE/$firstchar/$pkgname.xml"; + return -r $catfile ? $catfile : undef; } @@ -309,6 +311,7 @@ sub catalogue_find_ctan_path { my ($pkgname,$do_copy) = @_; my $catfile = &catalogue_find_file ($pkgname); +#warn $catfile ? "got catalogue file $catfile\n" : "no catalogue file\n": return undef if ! $catfile; # get the raw tag from the catalogue file. diff --git a/Master/tlpkg/tlpsrc/context-collating-marks.tlpsrc b/Master/tlpkg/tlpsrc/context-collating-marks.tlpsrc index 716cc4461ba..80e71c2e536 100644 --- a/Master/tlpkg/tlpsrc/context-collating-marks.tlpsrc +++ b/Master/tlpkg/tlpsrc/context-collating-marks.tlpsrc @@ -1,3 +1,2 @@ category ConTeXt depend context -catalogue context-collatingmarks |