summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin/tlpkginfo
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-12-14 00:38:22 +0000
committerKarl Berry <karl@freefriends.org>2015-12-14 00:38:22 +0000
commit0b9633dcf60b13d1ceb5b4d80fcdeb3164b850a2 (patch)
treeb9db8927cfbd69271fa852c2fabcbffebca01b17 /Master/tlpkg/bin/tlpkginfo
parent481c4809129e880a9a1ff994b87441045223e029 (diff)
beamertheme-phnompenh, renamed from beamerthemephnompenh
git-svn-id: svn://tug.org/texlive/trunk@39100 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tlpkginfo')
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo22
1 files changed, 12 insertions, 10 deletions
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?
? &copy_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;
}
#