summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-07-26 23:23:54 +0000
committerKarl Berry <karl@freefriends.org>2011-07-26 23:23:54 +0000
commite9b5b96e62aa1a8333723a208b797d430da33190 (patch)
tree69a06e6efc1c64027582706fd34e2ebb7dd2a2a5 /Master/tlpkg/TeXLive
parent4ec9ace6b030847df0da2a018e2dce6927f7eb21 (diff)
pass .tlpsrc to from_file; have from_file not double-add .tlpsrc; otherwise, tlprm erroneously reads a file named, e.g., "ppower4" as the tlpsrc
git-svn-id: svn://tug.org/texlive/trunk@23238 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 0de0d502933..bab1db1a1bc 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -55,14 +55,14 @@ sub from_file {
my $srcfile = $_[0];
my $pkgname = TeXLive::TLUtils::basename($srcfile);
$pkgname =~ s/\.tlpsrc$//;
-
+
if (! -r "$srcfile") {
# if the argument is not readable as is, try looking for it in the
# hierarchy where we are. The %INC hash records where packages were
# found, so we use that to locate ourselves.
(my $trydir = $INC{"TeXLive/TLPSRC.pm"}) =~ s,/[^/]*$,,;
chomp ($trydir = `cd $trydir/../tlpsrc && pwd`); # make absolute
- my $tryfile = "$trydir/$srcfile.tlpsrc";
+ my $tryfile = "$trydir/$pkgname.tlpsrc";
#warn "$trydir\n$tryfile\n";
$srcfile = $tryfile if -r $tryfile;
}