From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Aug 2008 22:17:13 +0000 (-0400)
Subject: fix misc breakage from plugin safe/rebuild data addition
X-Git-Tag: 2.60~90
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=018321f2c8d2f130c2968642c3b9cae7378841ef;p=ikiwiki.git

fix misc breakage from plugin safe/rebuild data addition
---

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c87fb80f5..e77b20ffd 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,7 +34,7 @@ sub dumpline ($$$$) { #{{{
 	}
 	elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^-A-Za-z0-9_]/ } @$value) {
 		# dump simple array as qw{}
-		$dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+		$dumpedvalue="[qw{".join(" ", @$value)."}]";
 	}
 	else {
 		$dumpedvalue=Dumper($value);
@@ -62,7 +62,7 @@ sub dumpvalues ($@) { #{{{
 		my $key=shift;
 		my %info=%{shift()};
 
-		next if $info{type} eq "internal" || $key eq "plugin";
+		next if $key eq "plugin" || $info{type} eq "internal";
 		
 		push @ret, "\t# ".$info{description} if exists $info{description};
 		
@@ -92,8 +92,10 @@ sub gendump ($) { #{{{
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
-		push @ret, "", "\t# $plugin plugin";
-		push @ret, dumpvalues(\%setup, @{$setup});
+		my @values=dumpvalues(\%setup, @{$setup});
+		if (@values) {
+			push @ret, "", "\t# $plugin plugin", @values;
+		}
 	}
 
 	unshift @ret,