diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2004-09-13 06:15:22 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2004-09-13 06:15:22 +0000 |
| commit | e7a96f4d862b47b9481d919b84bc908725a2a4ea (patch) | |
| tree | bb1a39e68b631d2ff7989d816fbd70c60e2409db /perl-install | |
| parent | 23e5751f314c40b9f75005d1e61883b40174b48c (diff) | |
| download | drakx-e7a96f4d862b47b9481d919b84bc908725a2a4ea.tar drakx-e7a96f4d862b47b9481d919b84bc908725a2a4ea.tar.gz drakx-e7a96f4d862b47b9481d919b84bc908725a2a4ea.tar.bz2 drakx-e7a96f4d862b47b9481d919b84bc908725a2a4ea.tar.xz drakx-e7a96f4d862b47b9481d919b84bc908725a2a4ea.zip | |
Fixed "dynamic()" in scannerdrake to do not contain anything interactive.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 5ceadf9a6..c8acc355b 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -14,7 +14,7 @@ DEST = $(STAGE2_LIVE) DESTREP4PMS = $(DEST)$(REP4PMS) PERL = perl LOCALFILES = $(patsubst %, ../tools/%,ddcprobe/ddcxinfos serial_probe/serial_probe xhost+) -DIRS = c Newt resize_fat xf86misc #po +DIRS = #c Newt resize_fat xf86misc #po CFLAGS = -Wall override CFLAGS += -pipe diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index f23d4d201..09508e280 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -152,14 +152,9 @@ sub dynamic() { if (member($_->{val}{DESCRIPTION}, keys %$scanner::scannerDB)) { $name = $_->{val}{DESCRIPTION}; $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap - if ($scanner::scannerDB->{$name}{flags}{unsupported}) { - $in->ask_warn('Scannerdrake', N("The %s is not supported by this version of %s.", removeverticalbar($name), $distroname)); - next; - } + next if ($scanner::scannerDB->{$name}{flags}{unsupported}); scanner::confScanner($name, $_->{port}, $_->{val}{vendor}, $_->{val}{id}, ""); - } else { - $in->ask_warn('Scannerdrake', N("The %s is not known by this version of Scannerdrake.", removeverticalbar($name))); } } } |