summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-09-28 23:12:12 +0000
committerKarl Berry <karl@freefriends.org>2007-09-28 23:12:12 +0000
commit854cd73df1ad1efcdcc8df4bea66ca468d99236e (patch)
treef672be49ae716217766fca7b882edd02cee241de /Build
parentb76bd590ae0a6d1fadac72c841e88b8e02ca6ae0 (diff)
(files): -e is wrong; try -f || -l.
git-svn-id: svn://tug.org/texlive/trunk@5059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/cdbuild/place25
1 files changed, 11 insertions, 14 deletions
diff --git a/Build/cdbuild/place b/Build/cdbuild/place
index 9651519bdbb..bbd2516e255 100755
--- a/Build/cdbuild/place
+++ b/Build/cdbuild/place
@@ -137,20 +137,17 @@ find (\&files,".");
foreach $file (sort keys %Old) {
print "* $file: [retained=$New{$file}]\n";
- # and if the file does not exist, don't try to remove it -- we
- # probably did so by hand and didn't bother to update the tpm.
+ # if the old file does not exist, don't try to remove it -- we
+ # probably did so by hand and didn't bother to update.
next unless -e "$M/$file";
- # don't remove tpm or lists file, they won't be in the new package.
- if (! $New{$file} && $file !~ /\.tpm$/ && $file !~ m,/lists/[^/]+$,) {
- &my_system ("svn remove $M/$file");
- }
- $dirs{dirname ("$M/$file")}++;
+ my $dname = dirname ("$M/$file");
+ $dirs{$dname}++;
}
# copy files
-my $Job = "tar cf - . | (cd $M && tar xf - )";
-&my_system ($Job);
+my $job = "tar cf - . | (cd $M && tar xf - )";
+&my_system ($job);
# sort so dirs will be added before subdirs.
foreach $file (sort keys %New) {
@@ -169,7 +166,7 @@ if ($newpackage) {
&add_file ("$M/tlpkg/tlpsrc/$package.tlpsrc");
}
-# these two dirs will essentially always change, so just list them.
+# this file will often change, so be sure and include it.
$dirs{"$M/tlpkg/tlpsrc/$package.tlpsrc"}++;
# print dirs with changed files, for svn commit purposes.
@@ -217,10 +214,10 @@ sub buildfilelist
sub files
{
- if (-e) {
- $This=$File::Find::name;
+ if (-f || -l) { # consider files or symlinks
+ $This = $File::Find::name;
$This =~ s/^\.\///;
- $New{$This}=1;
+ $New{$This} = 1;
}
}
@@ -247,7 +244,7 @@ sub add_file
}
&my_system ("svn add $newfile");
-
+
# remember that we changed this directory.
$dirs{$newdir}++;
}