* Various minor bug fixes for silly mistakes in the code, thanks to the

  various reviewers.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9636c5f94178d19f1eb4cb3ccb2e4c4ea45e08bc..6f9c78075f88509524314feea170e48e50377398 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -128,8 +128,8 @@ my $state_loaded=0;
 sub loadstate () { #{{{
        return if $state_loaded;
        if (-e "$config{wikistatedir}/aggregate") {
 sub loadstate () { #{{{
        return if $state_loaded;
        if (-e "$config{wikistatedir}/aggregate") {

-               open (IN, "$config{wikistatedir}/aggregate" ||
-                       die "$config{wikistatedir}/aggregate: $!");
+               open(IN, "$config{wikistatedir}/aggregate") ||
+                       die "$config{wikistatedir}/aggregate: $!";

                while (<IN>) {
                        $_=IkiWiki::possibly_foolish_untaint($_);
                        chomp;
                while (<IN>) {
                        $_=IkiWiki::possibly_foolish_untaint($_);
                        chomp;

diff --git a/debian/changelog b/debian/changelog
index 72eeea733eb3e5188b8ebb3f6bd8bf915ea29dcd..17412d9d0e16476fe5b680a8e83568181b375d30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.6) UNRELEASED; urgency=low
+
+  * Various minor bug fixes for silly mistakes in the code, thanks to the
+    various reviewers.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 28 Jul 2007 17:01:35 -0400
+

 ikiwiki (2.5) unstable; urgency=low
 
   * Wrap the editpage template in the standard misctemplate, this allows the
 ikiwiki (2.5) unstable; urgency=low
 
   * Wrap the editpage template in the standard misctemplate, this allows the

diff --git a/doc/bugs/weird_syntax_in_aggregate.pm.mdwn b/doc/bugs/weird_syntax_in_aggregate.pm.mdwn
index 2be88cd3bee1caf221705c5bd53821d7fe6327cb..632ff2c35c098ca0087477b6ac870146f91fa886 100644 (file)
--- a/doc/bugs/weird_syntax_in_aggregate.pm.mdwn
+++ b/doc/bugs/weird_syntax_in_aggregate.pm.mdwn
@@ -4,4 +4,6 @@
 It looks like the intent was "open this file, and die if you can't", 
 but I'm pretty sure it actually means "open this file and ignore errors
 silently". Shouldn't this be `open(IN, $file) || die "$file: $!";`
 It looks like the intent was "open this file, and die if you can't", 
 but I'm pretty sure it actually means "open this file and ignore errors
 silently". Shouldn't this be `open(IN, $file) || die "$file: $!";`

-(i.e. with the parens before the call to `die`)? --Ethan
\ No newline at end of file
+(i.e. with the parens before the call to `die`)? --Ethan
+
+> Thanks, [[done]] --[[Joey]]