diff options
Diffstat (limited to 'perl-install/printer')
| -rw-r--r-- | perl-install/printer/main.pm | 6 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index ac4ee0fbf..d0c4639bf 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -662,7 +662,7 @@ sub read_location { my ($cupsd_conf_ptr, $path) = @_; my @result; - if (grep { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) { + if (any { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) { my $location_start = -1; my $location_end = -1; # Go through all the lines, bail out when start and end line found @@ -707,7 +707,7 @@ sub rip_location { my @location; my $location_start = -1; my $location_end = -1; - if (grep { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) { + if (any { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) { # Go through all the lines, bail out when start and end line found for (my $i = 0; $i <= $#{$cupsd_conf_ptr} == -1; @@ -1617,7 +1617,7 @@ sub poll_ppd_base() { # recommended and there was a PostScript PPD? Make # the PostScript PPD the recommended one my $firstfound = $foundkeys[0]; - if (!(grep { /\(recommended\)/ } @foundkeys)) { + if (!(any { /\(recommended\)/ } @foundkeys)) { # Do it only if none of the native PostScript # PPDs for this printer is already "recommended" foreach (keys %{$thedb{$firstfound}}) { diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 6dd39f3c0..f0c73eaf1 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -3172,7 +3172,7 @@ sub network_configured() { my @netscripts = cat_("ls -1 $::prefix/etc/sysconfig/network-scripts/ |"); my $netconfigured = 0; - ( /ifcfg-/ and !/(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)/ and + (/ifcfg-/ and !/(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)/ and !/(~|\.bak)$/ and $netconfigured = 1) foreach @netscripts; return $netconfigured; } @@ -3673,7 +3673,7 @@ sub main { title => N("Printerdrake"), messages => N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."), cancel => (""), - ok => ("")}, + ok => ("") }, # List the queues [ if_(!$noprinters, { val => \$menuchoice, format => \&translate, |