diff options
author | Norbert Preining <preining@logic.at> | 2009-05-22 10:21:16 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-05-22 10:21:16 +0000 |
commit | 643c19ccc0d63265b6610a8379dac9cae3b5e138 (patch) | |
tree | a6b14c4e1c1b60b83afac2ba6ba2fa2ea299e3f9 | |
parent | 7a1cbc2ef3e12bd173d6f20546e1e7b28d805379 (diff) |
place: create emtpy tlpsrc files since name and category are set
automatically
TLPSRC: fix setting package name from empty tlpsrc file if the file name
contains directories
git-svn-id: svn://tug.org/texlive/trunk@13375 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 3 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/place | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index aa3d2d6a8e0..c39152b56e5 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -44,7 +44,8 @@ sub from_file my $self = shift; die "need exactly one filename for initialization" if @_ != 1; my $srcfile = $_[0]; - (my $pkgname = $srcfile) =~ s/\.tlpsrc$//; + 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 diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place index cc754a93c46..5b0d796e4ab 100755 --- a/Master/tlpkg/libexec/place +++ b/Master/tlpkg/libexec/place @@ -90,7 +90,10 @@ if (! -r $tlpsrcfile) { local *TLPSRC; $TLPSRC = ">$tlpsrcfile"; open (TLPSRC) || die "open($TLPSRC) failed: $!"; - $tlpsrc->writeout(\*TLPSRC); + # not needed, we only set name and category which are taken + # be default from the file name, so do not create useless entries + # but only empty files + # $tlpsrc->writeout(\*TLPSRC); close TLPSRC; } } else { |