Skip to content

Commit b54d7e0

Browse files
committed
Fully disable checks when $ENV{SKIP_MSI_STEP} is true
Otherwise the system kept checking for the wix dirs even though they are not needed.
1 parent af07fea commit b54d7e0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Perl/Dist/Strawberry.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ sub parse_options {
8484
$self->global->{image_dir_quotemeta} = $idq;
8585
$self->global->{image_dir_url} = "file:///$idu";
8686

87-
if (defined $self->global->{wixbin_dir}) {
87+
if (defined $self->global->{wixbin_dir} && !$ENV{SKIP_MSI_STEP}) {
8888
my $d = $self->global->{wixbin_dir};
8989
unless (-f "$d/candle.exe" && -f "$d/light.exe") {
9090
die "ERROR: invalid wixbin_dir '$d' (candle.exe+light.exe not found)\n";
@@ -122,7 +122,7 @@ sub do_job {
122122
$i = 0;
123123
for (@{$self->{build_job_steps}}) {
124124
$self->message(1, "checking [step:$i] ".ref($_));
125-
$_->check unless $_->{data}->{done}; # dies on error
125+
$_->check unless $_->{data}->{done} || $_->{config}->{disable}; # dies on error
126126
$i++;
127127
};
128128

0 commit comments

Comments
 (0)