diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-05 08:29:52 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-05 08:29:52 +0000 |
| commit | 384cf822a72ba52c63fcfb67f3387b49771cce5e (patch) | |
| tree | 75231a40bfcec287bf30547af058f30efcce295c /perl-install | |
| parent | f264e5e3a0c08ff0958f3f41b3be9a082d58988b (diff) | |
| download | drakx-backup-do-not-use-384cf822a72ba52c63fcfb67f3387b49771cce5e.tar drakx-backup-do-not-use-384cf822a72ba52c63fcfb67f3387b49771cce5e.tar.gz drakx-backup-do-not-use-384cf822a72ba52c63fcfb67f3387b49771cce5e.tar.bz2 drakx-backup-do-not-use-384cf822a72ba52c63fcfb67f3387b49771cce5e.tar.xz drakx-backup-do-not-use-384cf822a72ba52c63fcfb67f3387b49771cce5e.zip | |
in manual adding:
- let's have unique UPS names in the list
- fix reading driver from the list
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/drakups | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups index 1e751c4e3..6e12956f8 100755 --- a/perl-install/standalone/drakups +++ b/perl-install/standalone/drakups @@ -51,7 +51,7 @@ sub readDriversList() { driver => $driver, extra => $extra, }; - push @ups, "$vendor|$model"; + push @ups, "$vendor|$model ($extra)"; } } \%ups, \@ups; @@ -129,9 +129,9 @@ Do you want to autodetect UPS devices connected to this machine or to manually s data => [ { label => N("Manufacturer / Model:"), val => \$ups, list => $model_list, type => 'combo', sort => 1, separator => '|' }, ], post => sub { - ($vendor, $model) = split(/\|/, $ups); + ($vendor, $model) = ($1, $2) if $ups =~ /(.*)\|(.*) \(/; ($name, $driver, $port) = ("myups", $ups_models->{$vendor}{$model}{driver}, ""); - ($driver) = split(/\s*/, $driver); + ($driver) = split(/\s+/, $driver); "driver"; }, }, |