summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-08-18 15:39:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-08-18 15:39:24 +0000
commitd634e60406a49fe6a7fb6d5245da5567a92e6077 (patch)
tree915491dd74c08f96f644314b58b4322ebba926b0
parent7c1274c3b56de4151264f8d5b0c0237802ba9e67 (diff)
downloaddrakx-d634e60406a49fe6a7fb6d5245da5567a92e6077.tar
drakx-d634e60406a49fe6a7fb6d5245da5567a92e6077.tar.gz
drakx-d634e60406a49fe6a7fb6d5245da5567a92e6077.tar.bz2
drakx-d634e60406a49fe6a7fb6d5245da5567a92e6077.tar.xz
drakx-d634e60406a49fe6a7fb6d5245da5567a92e6077.zip
(simple_read_rpmsrate) only install HW packages of weigh 4 or 5
-rwxr-xr-xperl-install/standalone/harddrake212
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index c486e516b..5555ca2e9 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -584,12 +584,12 @@ $password_w->set_visibility(0); #set_invisible_char('*');
sub simple_read_rpmsrate() {
map { split(' ', $_) } map {
- if (my ($p, $packages) = /[^!]HW"(.*)"(.*)/) {
- if_(detect_devices::matching_desc__regexp($p), $packages);
- } elsif (($p, $packages) = /[^!]HW_CAT"(.*)"(.*)/) {
- if_(modules::probe_category($p), $packages);
- } elsif (($p, $packages) = /[^!]DRIVER"(.*)"(.*)/) {
- if_(detect_devices::matching_driver__regexp($p), $packages);
+ if (my ($priority, $p, $packages) = /(\d+)\s*[^!]HW"(.*)"(.*)/) {
+ if_(3 < $priority && detect_devices::matching_desc__regexp($p), $packages);
+ } elsif (($priority, $p, $packages) = /(\d+)\s*[^!]HW_CAT"(.*)"(.*)/) {
+ if_(3 < $priority && modules::probe_category($p), $packages);
+ } elsif (($priority, $p, $packages) = /(\d+)\s*[^!]DRIVER"(.*)"(.*)/) {
+ if_(3 < $priority && detect_devices::matching_driver__regexp($p), $packages);
} else {
();
}