Fixed missing UninstallString from variables.
This commit is contained in:
parent
91c7116c09
commit
3c8539e8b6
12
pkgtool.pm
12
pkgtool.pm
|
@ -1890,8 +1890,18 @@ sub remove_packages ($$$$$$$$$$$$)
|
||||||
$db, $def, $name, $dispname, $basedir, $genericmsiparams, $config, $counters, $removecontext);
|
$db, $def, $name, $dispname, $basedir, $genericmsiparams, $config, $counters, $removecontext);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$error = remove_package_fallback($channel, $vars, $paramlist, $inst, $condition, $dispname,
|
my $uninst = $$inst{Uninstall};
|
||||||
|
my $quninst = $$inst{QUninstall};
|
||||||
|
$quninst = $uninst unless defined $quninst;
|
||||||
|
|
||||||
|
my $set = 0;
|
||||||
|
if (defined $quninst && ! defined $$vars{uninstallstring}) {
|
||||||
|
$$vars{uninstallstring} = $quninst;
|
||||||
|
$set =1;
|
||||||
|
}
|
||||||
|
$error = remove_package_fallback($channel, $vars, $paramlist, $inst, $condition, $dispname,
|
||||||
$ver, $printver, $db, $counters, $removecontext);
|
$ver, $printver, $db, $counters, $removecontext);
|
||||||
|
delete $$vars{uninstallstring} if $set;
|
||||||
}
|
}
|
||||||
return $error if defined $error;
|
return $error if defined $error;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue