From 4f51703fea8b4d8872be207cf6e3d00e3c64253d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:25:43 -0400 Subject: web commit by intrigeri: bug submission --- doc/bugs/package_build_fails_in_non-English_environment.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/package_build_fails_in_non-English_environment.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/package_build_fails_in_non-English_environment.mdwn b/doc/bugs/package_build_fails_in_non-English_environment.mdwn new file mode 100644 index 000000000..1e5c72fd8 --- /dev/null +++ b/doc/bugs/package_build_fails_in_non-English_environment.mdwn @@ -0,0 +1,3 @@ +basewiki_brokenlinks.t fails when running dpkg-buildpackage in non-English environment : it greps for an (non-)error message that is i18n'd. + +The `LANG=` on line 9 does not seem to do what it's supposed to, go figure. -- cgit v1.2.3 From 299fd7fa2e6e4b0bd30d1e1bfcca47854f7d5921 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:32:13 -0400 Subject: web commit by intrigeri: bug submission --- doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn new file mode 100644 index 000000000..932d2de29 --- /dev/null +++ b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn @@ -0,0 +1,4 @@ +After building a fresh deb from current Git master (9b62dac4bcf62f3a1f76ec5a7ed5a90db16ea1c8) : + + $ ikiwiki --setup ~/ikiwiki.setup --rebuild + Undefined subroutine &IkiWiki::refresh called at /usr/share/perl5/IkiWiki/Setup.pm line 113. -- cgit v1.2.3 From ce4c5142b05cb31876bf000ea728db9d56fa39ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:40:25 -0400 Subject: web commit by intrigeri: update, found a possible (random) fix --- doc/bugs/package_build_fails_in_non-English_environment.mdwn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/package_build_fails_in_non-English_environment.mdwn b/doc/bugs/package_build_fails_in_non-English_environment.mdwn index 1e5c72fd8..565672a67 100644 --- a/doc/bugs/package_build_fails_in_non-English_environment.mdwn +++ b/doc/bugs/package_build_fails_in_non-English_environment.mdwn @@ -1,3 +1,9 @@ -basewiki_brokenlinks.t fails when running dpkg-buildpackage in non-English environment : it greps for an (non-)error message that is i18n'd. +basewiki_brokenlinks.t fails when running dpkg-buildpackage in non-English environment : it greps for an (non-)error message that is i18n'd. This of course does not happen when building in a proper chroot environment... which happens to fail as well, for other reasons, but this will be for another bug. The `LANG=` on line 9 does not seem to do what it's supposed to, go figure. + +I've never had to understand the Unix locales, so I randomly tried to replace `LANG=` in basewiki_brokenlinks.t with : + +- `LANG=C` : fails +- `LANGUAGE=` : fails +- `LANGUAGE=C` : works! -- cgit v1.2.3 From 40975cd29d4fd1b17e54e7dd24a31b4cc1cdbf5f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:47:51 -0400 Subject: web commit by intrigeri: initial bug submission --- doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn b/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn new file mode 100644 index 000000000..77e9b3560 --- /dev/null +++ b/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn @@ -0,0 +1,11 @@ +Trying to build current Git master in a (two weeks old - no DSL here) sid chroot triggers : + + rendering news.mdwn + Can't locate Image/Magick.pm in @INC (@INC contains: . blib/lib /etc/perl /usr/local/lib/perl/5.10.0 /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 175) line 2. + BEGIN failed--compilation aborted at (eval 175) line 2. + + make[1]: *** [extra_build] Error 2 + make[1]: Leaving directory `/tmp/buildd/ikiwiki-2.54' + make: *** [build-stamp] Error 2 + +Adding perlmagick to the build-deps fixes it. I read somewhere in debian/changelog that this build-deb was not needed, but... -- cgit v1.2.3 From 99523151a8fa49d45189eed929ffb6d937308eca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:48:41 -0400 Subject: web commit by http://smcv.pseudorandom.co.uk/ --- doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn index 932d2de29..827aff0f2 100644 --- a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn +++ b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn @@ -2,3 +2,5 @@ After building a fresh deb from current Git master (9b62dac4bcf62f3a1f76ec5a7ed5 $ ikiwiki --setup ~/ikiwiki.setup --rebuild Undefined subroutine &IkiWiki::refresh called at /usr/share/perl5/IkiWiki/Setup.pm line 113. + +> Patch coming soon to the "bugs" branch in http://git.debian.org/?p=users/smcv/ikiwiki.git --smcv -- cgit v1.2.3 From bed1f1037a4dfe6368c81ea2e2a0ac32f56126ce Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Jul 2008 22:52:46 +0100 Subject: Add missing requirement of IkiWiki::render before starting to render things --- IkiWiki/Setup.pm | 2 ++ doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 2b76efc16..3b7a11253 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -97,6 +97,8 @@ sub setup () { #{{{ loadplugins(); checkconfig(); + require IkiWiki::Render; + if ($config{render}) { commandline_render(); } diff --git a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn index 827aff0f2..c0cc3fd9a 100644 --- a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn +++ b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn @@ -3,4 +3,5 @@ After building a fresh deb from current Git master (9b62dac4bcf62f3a1f76ec5a7ed5 $ ikiwiki --setup ~/ikiwiki.setup --rebuild Undefined subroutine &IkiWiki::refresh called at /usr/share/perl5/IkiWiki/Setup.pm line 113. -> Patch coming soon to the "bugs" branch in http://git.debian.org/?p=users/smcv/ikiwiki.git --smcv +> [[done]], it just needed "require IkiWiki::Render" before it started +> rendering. --[[smcv]] -- cgit v1.2.3 From 44e42209a83f92c3a75c5524e38b36342309b7c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 17:56:38 -0400 Subject: web commit by http://smcv.pseudorandom.co.uk/: I think I know what's wrong here too --- doc/bugs/package_build_fails_in_non-English_environment.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/package_build_fails_in_non-English_environment.mdwn b/doc/bugs/package_build_fails_in_non-English_environment.mdwn index 565672a67..fbe76538f 100644 --- a/doc/bugs/package_build_fails_in_non-English_environment.mdwn +++ b/doc/bugs/package_build_fails_in_non-English_environment.mdwn @@ -7,3 +7,5 @@ I've never had to understand the Unix locales, so I randomly tried to replace `L - `LANG=C` : fails - `LANGUAGE=` : fails - `LANGUAGE=C` : works! + +> For maximum precedence it should have been LC_ALL=C. Patch coming soon to http://git.debian.org/?p=users/smcv/ikiwiki.git --[[smcv]] -- cgit v1.2.3 From 60dc17c39cd14c72af04ff59146277e240e53e13 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Jul 2008 23:00:57 +0100 Subject: Hopefully fix regression tests in non-English environments --- doc/bugs/package_build_fails_in_non-English_environment.mdwn | 2 +- t/basewiki_brokenlinks.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/package_build_fails_in_non-English_environment.mdwn b/doc/bugs/package_build_fails_in_non-English_environment.mdwn index fbe76538f..521ba62f8 100644 --- a/doc/bugs/package_build_fails_in_non-English_environment.mdwn +++ b/doc/bugs/package_build_fails_in_non-English_environment.mdwn @@ -8,4 +8,4 @@ I've never had to understand the Unix locales, so I randomly tried to replace `L - `LANGUAGE=` : fails - `LANGUAGE=C` : works! -> For maximum precedence it should have been LC_ALL=C. Patch coming soon to http://git.debian.org/?p=users/smcv/ikiwiki.git --[[smcv]] +> For maximum precedence it should have been LC_ALL=C. [[done]], I think... --[[smcv]] diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index baee285e2..994e3e377 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -6,7 +6,7 @@ use Test::More 'no_plan'; ok(! system("mkdir t/tmp")); ok(! system("make -q ikiwiki.out")); ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); -ok(! system("LANG= perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out")); +ok(! system("LC_ALL=C perl -T -I. ./ikiwiki.out -plugin smiley -plugin brokenlinks -rebuild -underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki -templatedir=templates t/basewiki_brokenlinks t/tmp/out")); ok(`grep 'no broken links' t/tmp/out/index.html`); ok(-e "t/tmp/out/style.css"); ok(! system("rm -rf t/tmp t/basewiki_brokenlinks/.ikiwiki")); -- cgit v1.2.3 From 71fba7791f93f50768b345f318c87ac43ae45b63 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 20:20:26 -0400 Subject: add perlmagick to build deps needed since the doc wiki is using an [[img]] --- debian/control | 2 +- doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/debian/control b/debian/control index a50c13c26..36d83c640 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ikiwiki Section: web Priority: optional Build-Depends: perl, debhelper (>= 5) -Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl +Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess Uploaders: Joey Hess , Josh Triplett Standards-Version: 3.8.0 diff --git a/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn b/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn index 77e9b3560..f6c0266ba 100644 --- a/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn +++ b/doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn @@ -9,3 +9,6 @@ Trying to build current Git master in a (two weeks old - no DSL here) sid chroot make: *** [build-stamp] Error 2 Adding perlmagick to the build-deps fixes it. I read somewhere in debian/changelog that this build-deb was not needed, but... + +> It's not needed by the test suite, but once I added a img to the source +> wiki, it became needed. [[done]] --[[Joey]] -- cgit v1.2.3 From e3c0e4977449de2eec36e254a7e131693ba2f822 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Jul 2008 23:23:25 -0400 Subject: only htmlize errors when cgi is actually running --- IkiWiki.pm | 5 ----- IkiWiki/CGI.pm | 10 ++++++++++ doc/bugs/html_errors.mdwn | 3 +++ ikiwiki.in | 7 +++++-- po/ikiwiki.pot | 50 +++++++++++++++++++++++++++-------------------- 5 files changed, 47 insertions(+), 28 deletions(-) (limited to 'doc/bugs') diff --git a/IkiWiki.pm b/IkiWiki.pm index f1a5f8058..d4e19c388 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -189,11 +189,6 @@ sub loadplugin ($) { #{{{ sub error ($;$) { #{{{ my $message=shift; my $cleaner=shift; - if ($config{cgi}) { - print "Content-type: text/html\n\n"; - print misctemplate(gettext("Error"), - "

".gettext("Error").": $message

"); - } log_message('err' => $message) if $config{syslog}; if (defined $cleaner) { $cleaner->(); diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 6770f6feb..d805506aa 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -750,4 +750,14 @@ sub cgi (;$$) { #{{{ } } #}}} +# Does not need tobe called directly; all errors will go through here. +sub cgierror ($) { #{{{ + my $message=shift; + + print "Content-type: text/html\n\n"; + print misctemplate(gettext("Error"), + "

".gettext("Error").": $message

"); + die $@; +} #}}} + 1 diff --git a/doc/bugs/html_errors.mdwn b/doc/bugs/html_errors.mdwn index 5a60e0449..aef2f7f71 100644 --- a/doc/bugs/html_errors.mdwn +++ b/doc/bugs/html_errors.mdwn @@ -1,2 +1,5 @@ ikiwiki will generate html formatted error messages to the command line if --cgi is set, even if it's not yet running as a cgi + +> [[done]], at last. Oldest open bug.. just thought of an elegant fix! +> --[[Joey]] diff --git a/ikiwiki.in b/ikiwiki.in index e0a591824..cc3f210b5 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -100,7 +100,7 @@ sub getconfig () { #{{{ else { # wrapper passes a full config structure in the environment # variable - eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS}); + eval {possibly_foolish_untaint($ENV{WRAPPED_OPTIONS})}; if ($@) { error("WRAPPED_OPTIONS: $@"); } @@ -123,7 +123,10 @@ sub main () { #{{{ } elsif ($config{cgi}) { require IkiWiki::CGI; - cgi(); + eval {cgi()}; + if ($@) { + cgierror($@); + } } elsif ($config{render}) { require IkiWiki::Render; diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 8aef6cc1a..f94f5bdd3 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-11 06:04-0400\n" +"POT-Creation-Date: 2008-07-12 23:07-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "%s is not an editable page" msgstr "" #: ../IkiWiki/CGI.pm:438 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:266 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:261 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Render.pm:162 msgid "discussion" @@ -71,6 +71,10 @@ msgstr "" msgid "You are banned." msgstr "" +#: ../IkiWiki/CGI.pm:758 ../IkiWiki/CGI.pm:759 +msgid "Error" +msgstr "" + #: ../IkiWiki/Plugin/aggregate.pm:53 msgid "Aggregation triggered via web." msgstr "" @@ -148,7 +152,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:37 ../IkiWiki/Setup.pm:115 +#: ../IkiWiki/Plugin/amazon_s3.pm:37 ../IkiWiki/Setup.pm:117 msgid "done" msgstr "" @@ -228,6 +232,10 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" +#: ../IkiWiki/Plugin/img.pm:49 +msgid "Image::Magick not installed" +msgstr "" + #: ../IkiWiki/Plugin/img.pm:56 #, perl-format msgid "bad size \"%s\"" @@ -253,29 +261,29 @@ msgstr "" msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:106 +#: ../IkiWiki/Plugin/inline.pm:101 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:154 +#: ../IkiWiki/Plugin/inline.pm:149 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:220 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:241 +#: ../IkiWiki/Plugin/inline.pm:236 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:274 ../IkiWiki/Render.pm:99 +#: ../IkiWiki/Plugin/inline.pm:269 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:504 +#: ../IkiWiki/Plugin/inline.pm:506 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -297,15 +305,15 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:137 +#: ../IkiWiki/Plugin/meta.pm:141 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:171 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:184 +#: ../IkiWiki/Plugin/meta.pm:188 msgid "redir cycle is not allowed" msgstr "" @@ -387,11 +395,11 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:65 +#: ../IkiWiki/Plugin/poll.pm:60 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:73 +#: ../IkiWiki/Plugin/poll.pm:68 msgid "Total votes:" msgstr "" @@ -660,11 +668,11 @@ msgstr "" msgid "generating wrappers.." msgstr "" -#: ../IkiWiki/Setup.pm:105 +#: ../IkiWiki/Setup.pm:107 msgid "rebuilding wiki.." msgstr "" -#: ../IkiWiki/Setup.pm:108 +#: ../IkiWiki/Setup.pm:110 msgid "refreshing wiki.." msgstr "" @@ -712,15 +720,15 @@ msgstr "" msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:194 ../IkiWiki.pm:195 -msgid "Error" -msgstr "" - #. translators: The first parameter is a #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:770 +#: ../IkiWiki.pm:765 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" + +#: ../IkiWiki.pm:1203 +msgid "yes" +msgstr "" -- cgit v1.2.3 From 4ad9680d52b058aee9e81518dce5f00ff9e1bd44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Jul 2008 09:45:59 -0400 Subject: web commit by http://smcv.pseudorandom.co.uk/: suggest solution --- ...ar:_both__39____39___for___96__.page__42____39____63__.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/__96____96__clear:_both__39____39___for___96__.page__42____39____63__.mdwn b/doc/bugs/__96____96__clear:_both__39____39___for___96__.page__42____39____63__.mdwn index e389ce3ed..b0a63ba3c 100644 --- a/doc/bugs/__96____96__clear:_both__39____39___for___96__.page__42____39____63__.mdwn +++ b/doc/bugs/__96____96__clear:_both__39____39___for___96__.page__42____39____63__.mdwn @@ -15,3 +15,13 @@ adding this `clear: both`? > before the modification date. So all of them have to clear both above and > below. I'm sure there are better ways for the CSS to handle that. > --[[Joey]] + +>> There is indeed a better way - all the optional things below the +>> content are wrapped in `