diff options
| author | Didier Raboud <didier@raboud.com> | 2010-05-22 22:10:35 +0200 |
|---|---|---|
| committer | Didier Raboud <didier@raboud.com> | 2010-05-22 22:10:35 +0200 |
| commit | 4cb4effaad8c0b363678c620e8e5cd7d6ff13e77 (patch) | |
| tree | 10231b279914a2cbc94f56e577c7aaffa94d9af9 /foomatic-rip.in | |
| parent | 36e5a21d1ca4d27d217e044ef28757c9a03eff99 (diff) | |
| parent | 5294ceb9d1eb5d4dd512cffaac0db5c0af261fdc (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'foomatic-rip.in')
| -rwxr-xr-x | foomatic-rip.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/foomatic-rip.in b/foomatic-rip.in index 5b0415b..74e6798 100755 --- a/foomatic-rip.in +++ b/foomatic-rip.in @@ -5,7 +5,7 @@ use strict; use POSIX; use Cwd; -my $ripversion='$Revision: 3.43.2.11 $'; +my $ripversion='$Revision: 3.43.2.13 $'; #'# Fix emacs syntax highlighting # foomatic-rip is a spooler-independent filter script which takes @@ -374,7 +374,6 @@ if ($debug) { $logh->autoflush(1); } elsif (($quiet) && (!$verbose)) { # Quiet mode, do not log - close $logh; open LOG, "> /dev/null"; $logh = *LOG; @@ -4777,7 +4776,7 @@ sub readConfFile { if (open CONF, "< $file") { while (<CONF>) { - $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*)\s*$/); + $conf{$1}="$2" if (m/^\s*([^\#\s]\S*)\s*:\s*(.*?)\s*$/); } close CONF; } |