summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-05 19:39:30 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-05 19:39:30 -0400
commit4b4bce500620b7e562a8229c3ff0288ec6a6545d (patch)
treea94c5e9b8c8dee9cbbc70e92c6943daf68b16eb5
parent4b994ffed113aaa4cc4363c34853cab5a13280c4 (diff)
Revert "typo"
This reverts commit c8d3626c51bdc53781d9431b1da88ae1e92dc2d5.
-rw-r--r--IkiWiki.pm2
-rw-r--r--IkiWiki/Plugin/websetup.pm7
-rwxr-xr-xikiwiki.in2
3 files changed, 2 insertions, 9 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index e1c4b6e2f..bf4a0d415 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1045,7 +1045,7 @@ sub preprocess ($$$;$$) { #{{{
my $params=shift;
$params="" if ! defined $params;
- if (length $escape) {
+ f (length $escape) {
return "[[$prefix$command $params]]";
}
elsif (exists $hooks{preprocess}{$command}) {
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index b110939e4..2a5e27bf9 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -349,10 +349,7 @@ sub showform ($$) { #{{{
next;
}
- print STDERR "on $key\n";
-
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}} : ());
@@ -368,20 +365,16 @@ sub showform ($$) { #{{{
}
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]) {
- print STDERR "$key UNDEF and unset\n";
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 {
- print STDERR "for $key : $value[0] vs $config{$key}; type: $info{type}\n";
$config{$key}=$value[0];
}
}
diff --git a/ikiwiki.in b/ikiwiki.in
index beb405227..d8e848f87 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -132,7 +132,7 @@ sub main () { #{{{
foreach my $wrapper (@wrappers) {
%config=(%origconfig,
rebuild => 0,
- verbose => undef,
+ verbose => 0,
%{$wrapper},
);
checkconfig();