typo

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bf4a0d415ab0afc7270f25ca1ab9a7b4c2187a10..e1c4b6e2fdcb97ac2902c6e6fe0e78061f927ead 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1045,7 +1045,7 @@ sub preprocess ($$$;$$) { #{{{
                my $params=shift;
                $params="" if ! defined $params;
 
                my $params=shift;
                $params="" if ! defined $params;
 

-               f (length $escape) {
+               if (length $escape) {

                        return "[[$prefix$command $params]]";
                }
                elsif (exists $hooks{preprocess}{$command}) {
                        return "[[$prefix$command $params]]";
                }
                elsif (exists $hooks{preprocess}{$command}) {

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 2a5e27bf921ee98edc0ee7f12f1ca15497595368..b110939e4d86cb637f29031caab2645fe1300539 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -349,7 +349,10 @@ sub showform ($$) { #{{{
                                next;
                        }
 
                                next;
                        }
 

+                       print STDERR "on $key\n";
+

                        if (ref $config{$key} eq "ARRAY" || ref $info{example} eq "ARRAY") {
                        if (ref $config{$key} eq "ARRAY" || ref $info{example} eq "ARRAY") {

+                               print STDERR "$key is array\n";

                                @value=sort grep { length $_ } @value;
                                my @oldvalue=sort grep { length $_ }
                                        (defined $config{$key} ? @{$config{$key}} : ());
                                @value=sort grep { length $_ } @value;
                                my @oldvalue=sort grep { length $_ }
                                        (defined $config{$key} ? @{$config{$key}} : ());


@@ -365,16 +368,20 @@ sub showform ($$) { #{{{
                        }
                        else {
                                if (defined $config{$key} && $config{$key} eq $value[0]) {
                        }
                        else {
                                if (defined $config{$key} && $config{$key} eq $value[0]) {

+                                       print STDERR "$key SET SAME ($config{$key})\n";

                                        delete $rebuild{$field};
                                }
                                elsif (! defined $config{$key} && ! length $value[0]) {
                                        delete $rebuild{$field};
                                }
                                elsif (! defined $config{$key} && ! length $value[0]) {

+                                       print STDERR "$key UNDEF and unset\n";

                                        delete $rebuild{$field};
                                }
                                elsif ((! defined $config{$key} || ! $config{$key}) &&
                                       ! $value[0] && $info{type} eq "boolean") {
                                        delete $rebuild{$field};
                                }
                                elsif ((! defined $config{$key} || ! $config{$key}) &&
                                       ! $value[0] && $info{type} eq "boolean") {

+                                       print STDERR "omitting false $key\n";

                                        delete $rebuild{$field};
                                }
                                else {
                                        delete $rebuild{$field};
                                }
                                else {

+                                       print STDERR "for $key : $value[0] vs $config{$key}; type: $info{type}\n";

                                        $config{$key}=$value[0];
                                }
                        }
                                        $config{$key}=$value[0];
                                }
                        }

diff --git a/ikiwiki.in b/ikiwiki.in
index d8e848f8727c5dbfd11bc0f9ce976e0821b68cff..beb4052273d496c23bf33ba8080feff469407a6e 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -132,7 +132,7 @@ sub main () { #{{{
                        foreach my $wrapper (@wrappers) {
                                %config=(%origconfig,
                                        rebuild => 0,
                        foreach my $wrapper (@wrappers) {
                                %config=(%origconfig,
                                        rebuild => 0,

-                                       verbose => 0,
+                                       verbose => undef,

                                        %{$wrapper},
                                );
                                checkconfig();
                                        %{$wrapper},
                                );
                                checkconfig();