Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd692522

Browse files
committed
MSVC: Future-proof installation file skip logic.
This code relied on knowing exactly where in the source tree temporaryinstallations might appear. A reasonable hacker may not think to updatethis code when adding use of a temporary installation, making itfragile. Observe that commit9fa8b0ebroke it unnoticed, and commitdcae5fafixed it unnoticed. Back-patch to 9.5 only; use of temporaryinstallations is unlikely to change in released versions.
1 parent2cd40ad commitd692522

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

‎src/tools/msvc/Install.pm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ sub Install
9898
{wanted=>sub {
9999
/^.*\.sample\z/s
100100
&&push(@$sample_files,$File::Find::name);
101+
102+
# Don't find files of in-tree temporary installations.
103+
$_eq'share'and$File::Find::prune = 1;
101104
}
102105
},
103106
@top_dir);
@@ -152,6 +155,9 @@ sub Install
152155
{wanted=>sub {
153156
/^(.*--.*\.sql|.*\.control)\z/s
154157
&&push(@$pl_extension_files,$File::Find::name);
158+
159+
# Don't find files of in-tree temporary installations.
160+
$_eq'share'and$File::Find::prune = 1;
155161
}
156162
},
157163
@pldirs);
@@ -199,8 +205,6 @@ sub CopySetOfFiles
199205
print"Copying$what"if$what;
200206
foreach (@$flist)
201207
{
202-
nextif/regress/;# Skip temporary install in regression subdir
203-
nextif/ecpg.test/;# Skip temporary install in regression subdir
204208
my$tgt =$target . basename($_);
205209
print".";
206210
lcopy($_,$tgt) || croak"Could not copy$_:$!\n";

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp