Fixed WARNING due to incorrect ordering.
This commit is contained in:
parent
0d95931660
commit
c0c42808c9
12
pkgtool.pm
12
pkgtool.pm
|
@ -1361,6 +1361,12 @@ sub sort_package ($$)
|
||||||
{
|
{
|
||||||
my ($a, $b) = @_;
|
my ($a, $b) = @_;
|
||||||
|
|
||||||
|
if (! defined $a) {
|
||||||
|
return 0 unless defined $b;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return -1 unless defined $b;
|
||||||
|
|
||||||
my $auninst = $$a{Uninstall};
|
my $auninst = $$a{Uninstall};
|
||||||
my $aquninst = $$a{QUninstall};
|
my $aquninst = $$a{QUninstall};
|
||||||
$auninst = $aquninst if defined $aquninst;
|
$auninst = $aquninst if defined $aquninst;
|
||||||
|
@ -1368,12 +1374,6 @@ sub sort_package ($$)
|
||||||
my $bquninst = $$b{QUninstall};
|
my $bquninst = $$b{QUninstall};
|
||||||
$buninst = $aquninst if defined $bquninst;
|
$buninst = $aquninst if defined $bquninst;
|
||||||
|
|
||||||
if (! defined $a) {
|
|
||||||
return 0 unless defined $b;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return -1 unless defined $b;
|
|
||||||
|
|
||||||
my $amsi = $auninst =~ /msiexec/io;
|
my $amsi = $auninst =~ /msiexec/io;
|
||||||
my $bmsi = $buninst =~ /msiexec/io;
|
my $bmsi = $buninst =~ /msiexec/io;
|
||||||
if (! $amsi) {
|
if (! $amsi) {
|
||||||
|
|
Loading…
Reference in a new issue