diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-06-11 23:13:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-06-11 23:13:24 +0000 |
| commit | 0405309dde44eb8c66d4f4612860a93e267e6c84 (patch) | |
| tree | 68d07becbf309d7b0195e65807c7adff01a3116d /perl-install/detect_devices.pm | |
| parent | f0797699d8777c03d97e8b21d49b4c2455149603 (diff) | |
| download | drakx-0405309dde44eb8c66d4f4612860a93e267e6c84.tar drakx-0405309dde44eb8c66d4f4612860a93e267e6c84.tar.gz drakx-0405309dde44eb8c66d4f4612860a93e267e6c84.tar.bz2 drakx-0405309dde44eb8c66d4f4612860a93e267e6c84.tar.xz drakx-0405309dde44eb8c66d4f4612860a93e267e6c84.zip | |
- enhance perl2fcalls (which now handle /xxx(...)/ as a regexp in more cases)
- remove the use of /xxx (...)/x by /xxx(...)/ as perl2fcalls is getting smart
=> make gc happy which is very important, what would we be without him?
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index c12767aa7..0e44c63ac 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -40,7 +40,7 @@ sub cdroms() { if (my @l2 = IDEburners()) { require modules; modules::add_alias('scsi_hostadapter', 'ide-scsi'); - my $nb = 1 + max(-1, map { $_->{device} =~ /scd (\d+)/x } @l); + my $nb = 1 + max(-1, map { $_->{device} =~ /scd(\d+)/ } @l); foreach my $i (@l2) { log::l("IDEBurner: $i->{device}"); my ($e) = grep { $_->{device} eq $i->{device} } @l; @@ -72,7 +72,7 @@ sub floppy { first(floppies()) } sub isBurner { my $dev = $_[0]{device}; - if (my($nb) = $dev =~ /scd (.*)/x) { + if (my($nb) = $dev =~ /scd(.*)/) { grep { /^(scd|sr)$nb:.*writer/ } syslog(); } else { my $f = tryOpen($dev); #- SCSI burner are not detected this way. |