summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/cdbuild/place9
1 files changed, 7 insertions, 2 deletions
diff --git a/Build/cdbuild/place b/Build/cdbuild/place
index 00854662692..81fbe499c18 100755
--- a/Build/cdbuild/place
+++ b/Build/cdbuild/place
@@ -58,8 +58,13 @@ else {
find (\&files,".");
foreach $file (sort keys %Old) {
print "* $file: [retained=$New{$file}]\n";
- # don't remove tpm or lists file, they won't be in the new package
- if (! $New{$file} && $file !~ /\.tpm$/ && $file !~ m,/lists/[^/]+$,) {
+
+ # 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.
+ next unless -f "$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")}++;