diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-03 18:17:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-08-03 18:17:13 -0400 |
| commit | 018321f2c8d2f130c2968642c3b9cae7378841ef (patch) | |
| tree | b05a8223a5720e8c565ce054963e2dc7a01fe5f1 | |
| parent | 3baa1742f326bd0324a47b56bd39e96ebf625619 (diff) | |
| download | ikiwiki-018321f2c8d2f130c2968642c3b9cae7378841ef.tar ikiwiki-018321f2c8d2f130c2968642c3b9cae7378841ef.tar.gz | |
fix misc breakage from plugin safe/rebuild data addition
| -rw-r--r-- | IkiWiki/Setup/Standard.pm | 10 |
1 files changed, 6 insertions, 4 deletions
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, |