summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-03-13 17:05:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-03-13 17:05:19 +0000
commit3b99bfaf6d497b397101ef1d726d4b80b3ded3ed (patch)
tree60c10b8a70941327352081c7c7613d46bf5ba5de /perl-install
parent423f8b509330606973f9cb9905e325a07cb9a169 (diff)
downloaddrakx-backup-do-not-use-3b99bfaf6d497b397101ef1d726d4b80b3ded3ed.tar
drakx-backup-do-not-use-3b99bfaf6d497b397101ef1d726d4b80b3ded3ed.tar.gz
drakx-backup-do-not-use-3b99bfaf6d497b397101ef1d726d4b80b3ded3ed.tar.bz2
drakx-backup-do-not-use-3b99bfaf6d497b397101ef1d726d4b80b3ded3ed.tar.xz
drakx-backup-do-not-use-3b99bfaf6d497b397101ef1d726d4b80b3ded3ed.zip
simplify
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index ac36482d5..979448fba 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -220,15 +220,9 @@ sub read_conf {
}
}
# Convert alsa driver from old naming system to new one (snd-card-XXX => snd-XXX)
- foreach my $alias (sort keys %c) {
- if ($c{$alias}{alias} =~ /^snd-card/) {
- my $new_driver = $c{$alias}{alias};
- $new_driver =~ s/^snd-card/snd/;
- $c{$alias}{alias} = $new_driver;
- }
- }
# Ensure correct upgrade for snd-via683 and snd-via8233 drivers
foreach my $alias (sort keys %c) {
+ $c{$alias}{alias} =~ s/^snd-card/snd/;
$c{$alias}{alias} = 'snd-via82xx' if $c{$alias}{alias} =~ /^snd-via686|^snd-via8233/;
}
@@ -264,7 +258,7 @@ sub write_conf {
# Convert alsa driver from old naming system to new one (snd-card-XXX => snd-XXX)
# Ensure correct upgrade for snd-via683 and snd-via8233 drivers
s/snd-card/snd/g;
- s/snd-via(686|8233)/snd-via82xx/g;
+ s/^snd-via686|^snd-via8233/snd-via82xx/g;
} elsif ($conf{$alias}{$type} && $conf{$alias}{$type} ne $module) {
my $v = join(' ', uniq(deref($conf{$alias}{$type})));
$_ = "$type $alias $v\n";