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

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;
   }