File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments