From 0d57018d039ab38a6d992bfa7dab7ff64b51cd44 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 7 Jan 2003 12:17:33 +0000
Subject: fixes

---
 perl-install/printer/gimp.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'perl-install/printer/gimp.pm')

diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
index 95116cf53..a6bf28bbf 100644
--- a/perl-install/printer/gimp.pm
+++ b/perl-install/printer/gimp.pm
@@ -265,6 +265,7 @@ sub addentry {
 	    $sectionfound = 1 if /^\s*Printer\s*:\s*($section)\s*$/;
 	} else {
 	    if (!/^\s*$/ && !/^\s*;/) {
+          $_ = "$entry\n$_";
 		$entryinserted = 1;
 		last;
 	    }
@@ -289,15 +290,17 @@ sub removeentry {
     my $sectionfound;
     my @lines = split("\n", $filecontent);
     foreach (@lines) {
-	$_ = "$_\n";
 	if (!$sectionfound) {
 	    $sectionfound = /^\s*Printer\s*:\s*($section)\s*$/;
 	} else {
 	    last if /^\s*Printer\s*:\s*.*\s*$/; # Next section
-         last if /^\s*$entry/;
+         if (/^\s*$entry/) {
+             $_ = "";
+             last;
+         }
 	}
     }
-    return join "", @lines;
+    return join "\n", @lines;
 }
 
 sub removeprinter {
@@ -305,14 +308,17 @@ sub removeprinter {
     my $sectionfound;
     my @lines = split("\n", $filecontent);
     foreach (@lines) {
-	$_ = "$_\n";
 	if (!$sectionfound) {
-	    $sectionfound = /^\s*Printer\s*:\s*($section)\s*$/;
+	    if (/^\s*Printer\s*:\s*($section)\s*$/) {
+             $_ = "";
+             $sectionfound = 1;
+         }
 	} else {
 	    last if /^\s*Printer\s*:\s*.*\s*$/; # Next section
+         $_ = "";
 	}
     }
-    return join "", @lines;
+    return join "\n", @lines;
 }
 
 sub isprinterconfigured {
-- 
cgit v1.2.1