summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-22 14:17:26 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-22 14:17:26 -0400
commit8f6cdf3ae07536fdf1a197297b91677a1345eebc (patch)
tree19d31d177023df17d9a9927d1eb4e5c2e5968d3f
parent7825960d310977d1ae6fd9ab31d76b611c0f91e8 (diff)
listdirectives: Avoid listing _comment directives and generally assume any directive starting with _ is likewise internal.
-rw-r--r--IkiWiki/Plugin/listdirectives.pm2
-rw-r--r--debian/NEWS2
-rw-r--r--debian/changelog6
3 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index d2cebca34..bd73f1a04 100644
--- 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 c3574bdb6..75b6d0471 100644
--- 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 f25cab5bb..71445ea71 100644
--- 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