448682

2 files changed, 21 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 532bb7c..600227f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ lighttpd (1.4.19-1) UNRELEASED; urgency=low
      + remove 05_fdevent_fix.patch (merged upstream).
      + remove 06_mod_cgi_vuln_fix.patch (merged upstream).
      + refresh the rest of the series.
+  * debian/lighty-enable-mod:
+     + Reindent and remove trailing spaces.
+     + don't fail to remove a module that is already removed.
+       Patch from Michal Čihař (Closes: 448682).
 
  -- Pierre Habouzit <madcoder@debian.org>  Sun, 16 Mar 2008 10:11:45 +0100
 
diff --git a/debian/lighty-enable-mod b/debian/lighty-enable-mod
index 18f7424..c3fe0cb 100755
--- a/debian/lighty-enable-mod
+++ b/debian/lighty-enable-mod
@@ -38,11 +38,11 @@ if ($0 =~ /disable-mod$/) {
 #--- list of available modules
 my @files = bsd_glob($confdir.'conf-available/*.conf');
 print "Available modules: ";
-foreach my $file (@files) {		
-	if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {		
+foreach my $file (@files) {
+	if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
 		$available{$1} = $file;
 		print qq{$1 };
-	}			
+	}
 }
 print "\n";
 
@@ -50,9 +50,9 @@ print "\n";
 @files = bsd_glob($confdir.'conf-enabled/*.conf');
 print "Already enabled modules: ";
 foreach my $file (@files) {
-	if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {		
+	if (basename($file) =~ /^\d+\-([\w\-]+)\.conf$/) {
 		$enabled{$1} = $file;
-		print qq{$1 };		
+		print qq{$1 };
 	}
 }
 print "\n";
@@ -71,13 +71,13 @@ else {
 
 #--- activate (link) or deactivate (remove) module
 foreach my $do (@todo) {
-	
-	next unless defined($available{$do});	
-	my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($available{$do}));
-	
+
+
 	if ($enabling) {
+		next unless defined($available{$do});
+		my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($available{$do}));
 		print qq{Enabling $do: };
-		
+
 		my $st = stat($target);
 		unless ( -f $target ) {
 			if (symlink($available{$do}, $target)) {
@@ -101,8 +101,13 @@ foreach my $do (@todo) {
 		}
 	}
 	else {
-		print qq{Disabling $do\n};
-		unlink($target);
+		if (defined($enabled{$do})) {
+			print qq{Disabling $do\n};
+			my $target = sprintf("%s/conf-enabled/%s", $confdir,basename($enabled{$do}));
+			unlink($target);
+		} else {
+			print qq{Already disabled $do\n};
+		}
 	}
 }