From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 27 Feb 2010 21:36:57 +0000 (-0500)
Subject: Fix admin openid detection in setup automator, and avoid prompting for a password.
X-Git-Tag: 3.20100302~16
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=6aaa6e0d245e450315a073f62e27c233cefbe9ec

Fix admin openid detection in setup automator, and avoid prompting for a password.
---

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 79a610e20..9da594e99 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -144,7 +144,7 @@ sub import (@) {
 
 	# Create admin user(s).
 	foreach my $admin (@{$config{adminuser}}) {
-		next if $admin=~/^http\?:\/\//; # openid
+		next if defined IkiWiki::openiduser($admin);
 		
 		# Prompt for password w/o echo.
 		my ($password, $password2);
diff --git a/debian/changelog b/debian/changelog
index bdbd818e1..832bbaa85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * Loosen regexp, to allow empty quoted parameters in directives.
   * Add force_overwrite setting to make setup automator overwrite existing
     files/directories.
+  * Fix admin openid detection in setup automator, and avoid prompting
+    for a password.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500