diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-08-22 20:23:01 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-08-22 20:23:01 +0000 |
| commit | 80f25b9dafc6fb4c53294b7cca25ef8150d531ec (patch) | |
| tree | 0ffe8d8b7d57e9f1884ed949b7c648aa026028f3 /perl-install/printer/main.pm | |
| parent | 445ed2cb538df49e619f4fa63d6372de973e0757 (diff) | |
| download | drakx-backup-do-not-use-80f25b9dafc6fb4c53294b7cca25ef8150d531ec.tar drakx-backup-do-not-use-80f25b9dafc6fb4c53294b7cca25ef8150d531ec.tar.gz drakx-backup-do-not-use-80f25b9dafc6fb4c53294b7cca25ef8150d531ec.tar.bz2 drakx-backup-do-not-use-80f25b9dafc6fb4c53294b7cca25ef8150d531ec.tar.xz drakx-backup-do-not-use-80f25b9dafc6fb4c53294b7cca25ef8150d531ec.zip | |
Support for the new "ptal://..." (two slashes) URIs of the new HPOJ.
Diffstat (limited to 'perl-install/printer/main.pm')
| -rw-r--r-- | perl-install/printer/main.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index d0c4639bf..9c36fa55a 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -322,7 +322,7 @@ sub make_menuentry { my $connect = $printer->{configured}{$queue}{queuedata}{connect}; my $localremote; if ($connect =~ m!^(file|parallel|usb|serial):! || - $connect =~ m!^ptal:/mlc:! || + $connect =~ m!^ptal://?mlc:! || $connect =~ m!^mtink:!) { $localremote = N("Local Printers"); } else { @@ -339,7 +339,7 @@ sub make_menuentry { $connection = N(", USB printer #%s", $number); } elsif ($connect =~ m!^usb://!) { $connection = N(", USB printer"); - } elsif ($connect =~ m!^ptal:/(.+)$!) { + } elsif ($connect =~ m!^ptal://?(.+?)$!) { my $ptaldevice = $1; if ($ptaldevice =~ /^mlc:par:(\d+)$/) { my $number = $1; @@ -1993,10 +1993,10 @@ sub autodetectionentry_for_uri { return $p; } } - } elsif ($uri =~ m!^ptal:/mlc:!) { + } elsif ($uri =~ m!^ptal://?mlc:!) { # HP multi-function device (controlled by HPOJ) my $ptaldevice = $uri; - $ptaldevice =~ s!^ptal:/mlc:!!; + $ptaldevice =~ s!^ptal://?mlc:!!; if ($ptaldevice =~ /^par:(\d+)$/) { my $device = "/dev/lp$1"; foreach my $p (@autodetected) { |