diff options
| author | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 22:53:25 +0100 |
|---|---|---|
| committer | Simon McVittie <http://smcv.pseudorandom.co.uk/> | 2008-07-12 22:53:25 +0100 |
| commit | 5fe26d6bfc6b5153b2ab97bfffb3c57257feddd6 (patch) | |
| tree | 17c4f0fb5a8fa0e4a4fcc03392f8dfeec52483cc | |
| parent | f59d7f1e9b3851dd86acf9d46096ca8de6fad540 (diff) | |
| parent | bed1f1037a4dfe6368c81ea2e2a0ac32f56126ce (diff) | |
Merge branch 'bugs'
| -rw-r--r-- | IkiWiki/Setup.pm | 2 | ||||
| -rw-r--r-- | doc/bugs/Missing_build-dep_on_perlmagick__63__.mdwn | 11 | ||||
| -rw-r--r-- | doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn | 3 | ||||
| -rw-r--r-- | doc/users/smcv.mdwn | 1 |
4 files changed, 17 insertions, 0 deletions
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/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... diff --git a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn index 932d2de29..c0cc3fd9a 100644 --- a/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn +++ b/doc/bugs/Undefined_subroutine_IkiWiki::refresh.mdwn @@ -2,3 +2,6 @@ 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. + +> [[done]], it just needed "require IkiWiki::Render" before it started +> rendering. --[[smcv]] diff --git a/doc/users/smcv.mdwn b/doc/users/smcv.mdwn new file mode 100644 index 000000000..91f704208 --- /dev/null +++ b/doc/users/smcv.mdwn @@ -0,0 +1 @@ +[smcv.pseudorandom.co.uk](http://smcv.pseudorandom.co.uk/) |