summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-02-27 16:36:57 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-02-27 16:36:57 -0500
commit6aaa6e0d245e450315a073f62e27c233cefbe9ec (patch)
tree984ad69a61221be720e813222241da8cd5bd3309
parenta12c386c86d000971125d70bf22213fd9595ed45 (diff)
Fix admin openid detection in setup automator, and avoid prompting for a password.
-rw-r--r--IkiWiki/Setup/Automator.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
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