Add missing plugin section, and deal with missing sections with a warning.

diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 3ea19c63519bdecf6cd7331d21d722b3e0bc72de..2967761c8d3dab055bb52c098b40cb6762e68f3e 100644 (file)
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 0,
                        rebuild => undef,
                plugin => {
                        safe => 0,
                        rebuild => undef,

+                       section => "special-purpose",

                },
                add_underlays => {
                        type => "string",
                },
                add_underlays => {
                        type => "string",

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 48f3d4634da0371f988ba16ae1107849fcd24172..881e8a9d5960e9cad891b6b160de636bed03a3a9 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -223,6 +223,10 @@ sub commented_dump ($$) {
                my $setup=$pair->[1];
                my %s=@{$setup};
                my $section=$s{plugin}->{section};
                my $setup=$pair->[1];
                my %s=@{$setup};
                my $section=$s{plugin}->{section};

+               if (! defined $section) {
+                       print STDERR "warning: missing section in $plugin\n";
+                       $section="other";
+               }

                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {
                        push @ret, "", $indent.("#" x 70), "$indent# $section plugins",
                push @{$section_plugins{$section}}, $plugin;
                if (@{$section_plugins{$section}} == 1) {
                        push @ret, "", $indent.("#" x 70), "$indent# $section plugins",

diff --git a/debian/changelog b/debian/changelog
index 7905ae6fcfd0bc83115cab05cc16257b8c717291..85acaf5304d10e1905cc056f3e4e70e49882484e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20130213) UNRELEASED; urgency=low
 
   * Allow dots in directive parameter names. (tango)
 ikiwiki (3.20130213) UNRELEASED; urgency=low
 
   * Allow dots in directive parameter names. (tango)

+  * Add missing plugin section, and deal with missing sections with a warning.

 
  -- Joey Hess <joeyh@debian.org>  Fri, 15 Feb 2013 17:23:12 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 15 Feb 2013 17:23:12 -0400