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 79a610e20e1d50905e0a76e73bf13b080d3c7c3e..9da594e991e261e8b36c0bfc2f664be074f3816a 100644 (file)
--- 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}}) {
 
        # 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);
                
                # Prompt for password w/o echo.
                my ($password, $password2);

diff --git a/debian/changelog b/debian/changelog
index bdbd818e1c7212ee0c988944cc48835d878ee795..832bbaa85f3662a31acbcc3d3280af8b54a2b75f 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500