From 0b9633dcf60b13d1ceb5b4d80fcdeb3164b850a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Dec 2015 00:38:22 +0000 Subject: beamertheme-phnompenh, renamed from beamerthemephnompenh git-svn-id: svn://tug.org/texlive/trunk@39100 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tlpkg-ctan-check | 4 ++-- Master/tlpkg/bin/tlpkginfo | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'Master/tlpkg/bin') diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index b42cb0e23dd..7ea5674e8e9 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -73,8 +73,8 @@ my @TLP_working = qw( beamer beamer2thesis beamer-FUBerlin beamer-tut-pt beamer-verona beameraudience beamerdarkthemes beamerposter beamersubframe beamertheme-detlevcm beamertheme-metropolis - beamertheme-upenn-bc - beamerthemejltree beamerthemephnompenh + beamertheme-phnompenh beamertheme-upenn-bc + beamerthemejltree beamerthemenirma beebe begingreek begriff belleek bengali bera berenisadf besjournals bestpapers betababel beton diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 10625f738ce..bdb529cfebf 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -19,7 +19,7 @@ sub main { if ($#ARGV >= 0 && ($ARGV[0] =~ m/^--?rev(ision)?$/)) { &tlpkgrevision(); } else { - &ctaninfo(); + &ctaninfo (); } } @@ -135,6 +135,7 @@ sub find_ctan_dir { # The CTAN path to a package is sometimes stored in the TeX Catalogue, # but old entries don't have it, etc. Still, we want to use it if present. my $ctan_dir = &catalogue_find_ctan_path ($me, $do_copy); +#warn "find_ctan_dir: got $ctan_dir\n"; if (! $ctan_dir) { # fall back on many special cases (my $me_wo_babel = $me) =~ s,^babel-,,; # remove when Catalogue ready @@ -227,9 +228,6 @@ sub find_ctan_dir { # do last, for sake of subdirs above. $ctan_dir = "language/hyphenation" if $me =~ /^hyphen-/ && ! $ctan_dir; - } else { - warn "$0: could not find ctan dir for $pkgname ($me)\n"; - return 1; } if ($me eq "cm") { @@ -326,21 +324,25 @@ sub catalogue_find_ctan_path { # Subcase of (2): package name is babel-hungarian, but CTAN path is # babel-contrib/hungarian. Sigh. # -#warn "ctan path $ctan_path, pkg $pkgname\n"; +#warn "catalogue ctan path $ctan_path, pkg $pkgname\n"; + my $ret; if ($ctan_path =~ /file='true'/) { (my $ctan_babel_path = $ctan_path) =~ s,babel-contrib/,babel-,; if ($ctan_path =~ m,/$pkgname/, || $ctan_babel_path =~ m,/$pkgname/,) { - return undef; # pkg dir somewhere in path. + $ret = undef; # pkg dir somewhere in path. } else { - return $do_copy # are we called by prepare() or not? + $ret = $do_copy # are we called by prepare() or not? ? ©_to_tmpdir ($pkgname, "$CTAN/$ctan_loc") : "$CTAN/$ctan_loc"; } + } else { + # not a single file, so use the regular ctan location. + $ret = "$CTAN/$ctan_loc"; } - - # not a single file, so use the regular ctan location. - return $ctan_loc; + +#warn "catalogue returning $ret\n"; + return $ret; } # -- cgit v1.2.3