From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 28 Jul 2007 21:01:56 +0000 (+0000)
Subject: * Various minor bug fixes for silly mistakes in the code, thanks to the
X-Git-Tag: 2.6~296
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0f88082323b74d934c8c2d50666418bcd56b3c9;p=ikiwiki.git

* 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 9636c5f94..6f9c78075 100644
--- 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") {
-		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;
diff --git a/debian/changelog b/debian/changelog
index 72eeea733..17412d9d0 100644
--- 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
diff --git a/doc/bugs/weird_syntax_in_aggregate.pm.mdwn b/doc/bugs/weird_syntax_in_aggregate.pm.mdwn
index 2be88cd3b..632ff2c35 100644
--- 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: $!";`
-(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]]