listdirectives: Avoid listing _comment directives and generally assume any directive...

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index d2cebca342756fdbb8d9a31e34b43fe527bd4b4d..bd73f1a04e728638c19994c0d64a4f288a120150 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -45,7 +45,7 @@ sub checkconfig () {
 sub needsbuild (@) {
        my $needsbuild=shift;
 
-       @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
+       @fulllist = grep { ! /^_/ } sort keys %{$IkiWiki::hooks{preprocess}};
        @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
        $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 

diff --git a/debian/NEWS b/debian/NEWS
index c3574bdb64c35b33e7ef40de6a4e7db88d182ce2..75b6d0471ad6fd3b2806d2e32216f61d07759884 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.13) UNRELEASED; urgency=low
+ikiwiki (3.13) unstable; urgency=low
 
   The `ikiwiki-transition deduplinks` command introduced in the
   last release was buggy. If you followed the NEWS file instructions

diff --git a/debian/changelog b/debian/changelog
index f25cab5bbb3d85fb2d1749eaceff0d4377eb5d1e..71445ea71b94527d060ce1e87d7b97181fa4f332 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.13) UNRELEASED; urgency=low
+ikiwiki (3.13) unstable; urgency=low
 
   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
     containing .ikiwiki, abort with an error rather than creating it.
@@ -13,8 +13,10 @@ ikiwiki (3.13) UNRELEASED; urgency=low
     that need a srcdir.
   * ikiwiki-transition: deduplinks was broken and threw away all
     metadata stored by plugins in the index. Fix this bug.
+  * listdirectives: Avoid listing _comment directives and generally
+    assume any directive starting with _ is likewise internal.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 14:10:56 -0400
 
 ikiwiki (3.12) unstable; urgency=low