summaryrefslogtreecommitdiff
path: root/Master/tlpkg/libexec/place
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-10 20:30:53 +0000
committerKarl Berry <karl@freefriends.org>2019-07-10 20:30:53 +0000
commit4d842c76f517148162e91c2228d74a524be1cbcd (patch)
tree1cf7c49e7f916855ffe8641bed2a40efe92c1198 /Master/tlpkg/libexec/place
parent41854dae4a6cd008b4253b0e9deac4cbdcd085bd (diff)
doc,sync,etc.
git-svn-id: svn://tug.org/texlive/trunk@51603 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/libexec/place')
-rwxr-xr-xMaster/tlpkg/libexec/place10
1 files changed, 7 insertions, 3 deletions
diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place
index 2bf8f014274..6b58a52ccee 100755
--- a/Master/tlpkg/libexec/place
+++ b/Master/tlpkg/libexec/place
@@ -25,7 +25,7 @@ use Getopt::Long;
my $chicken = 0;
my $opt_contrib;
-my $opt_mode = "svn";
+my $opt_mode = "svn";
exit 2 unless Getopt::Long::GetOptions (
"n" => \$chicken,
"contrib=s" => \$opt_contrib,
@@ -219,10 +219,14 @@ $dirs{"$M/tlpkg/tlpsrc/$package.tlpsrc"}++;
# the directories will not be empty.
if (! $chicken) {
for my $empty_dir (&empty_dirs (keys %dirs_with_removals)) {
+ # every once in a while a directory consists only of newly-empty
+ # dirs. This will catch some of those; not worth trying to do full
+ # recursive search to get everything, cron.tl will report on leftovers.
+ chomp (my $empty_dir_parent = `cd $empty_dir/.. && pwd`);
if ($opt_mode eq "svn") {
- &xsystem ("cd $M && svn remove $empty_dir # empty dir");
+ &xsystem ("cd $M && svn remove $empty_dir $empty_dir_parent # emptydir");
} else {
- &xsystem ("cd $M && rmdir $empty_dir")
+ &xsystem ("cd $M && rmdir $empty_dir $empty_dir_parent")
}
# already in %dirs, so don't need to add.
}