diff options
| author | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:59:04 +0000 |
|---|---|---|
| committer | Arnaud Patard <rtp@mageia.org> | 2012-04-30 07:59:04 +0000 |
| commit | 8f5a440b8705732e2dd221cab769c1d796ba4338 (patch) | |
| tree | ed63636ee0304ee99ae054dad1d04fcc1bd358e0 | |
| parent | 411b42978a7cbbf70d47d474460ec86f5e300015 (diff) | |
| download | drakx-8f5a440b8705732e2dd221cab769c1d796ba4338.tar drakx-8f5a440b8705732e2dd221cab769c1d796ba4338.tar.gz drakx-8f5a440b8705732e2dd221cab769c1d796ba4338.tar.bz2 drakx-8f5a440b8705732e2dd221cab769c1d796ba4338.tar.xz drakx-8f5a440b8705732e2dd221cab769c1d796ba4338.zip | |
- packageByName: make sure to return the installed noarch rpm if any.
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 6eb18394c..111be93dc 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- packageByName: Fix noarch handling/search on 64bit as they're in 32 and 64 bit + media and in some cases it may return the not-installed rpm while the other is. + (it was found by default.jpg/xorg.conf not being done by configureX step, even + with task-x11 installed) - fix rebooting on autoinstall by using a "wider" regexp (otherwise udevd was not found by fuzzy_pidofs) and gives some time to udevd process to disappear. Also, don't try to unmount /dev as it's still used by other processes. diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 9fd8b8f09..c4c1a7edc 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -123,7 +123,11 @@ sub packageByName { my $best; foreach (@l) { if ($best && $best != $_) { - $_->compare_pkg($best) > 0 and $best = $_; + if ($best->fullname eq $_->fullname) { + $best = $_ if $_->flag_installed; + } else { + $_->compare_pkg($best) > 0 and $best = $_; + } } else { $best = $_; } |