From: Josh Triplett <josh@freedesktop.org>
Date: Thu, 10 Jul 2008 06:42:20 +0000 (-0700)
Subject: ikiwiki-transition: Fix command-line processing so the prefix_directives transition... 
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/1aab048e8117e65faa7e2d0020609ee83e8e3a70?hp=8cafbc5de66533ef742400b390606a61efdf1530

ikiwiki-transition: Fix command-line processing so the prefix_directives transition works again.
---

diff --git a/debian/changelog b/debian/changelog
index 951f2671d..5e812439b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 ikiwiki (2.54) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * Make it possible to load setup files w/o running them. Code
     needing to do so can call IkiWiki::Setup::load, which will return
     a hash of values.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 09 Jul 2008 22:27:19 -0400
+  [ Josh Triplett ]
+  * ikiwiki-transition: Fix command-line processing so the prefix_directives
+    transition works again.
+
+ -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700
 
 ikiwiki (2.53) unstable; urgency=low
 
diff --git a/ikiwiki-transition b/ikiwiki-transition
index e02c3aaed..ce081fe63 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -114,7 +114,7 @@ my $mode=shift;
 if ($mode eq 'prefix_directives') {
 	prefix_directives(@ARGV);
 }
-if ($mode eq 'hashpassword') {
+elsif ($mode eq 'hashpassword') {
 	hashpassword(@ARGV);
 }
 elsif ($mode eq 'indexdb') {