Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-09-15 15:38:24 -04:00
commit 0e89f374a6
3 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,26 @@
That one has bitten me for some time; here is the minimal testcase. There is
also an equivalent (I suppose) problem when using another plugin, but I hope
it's enough to track it down for this one.
$ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2)
$ cd bug-dep_order/
$ ./render_locally
[...]
$ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied'
$ [no output]
$ touch news/2010-07-31.mdwn
$ ./render_locally
refreshing wiki..
scanning news/2010-07-31.mdwn
building news/2010-07-31.mdwn
building news.mdwn, which depends on news/2010-07-31
building index.mdwn, which depends on news/2010-07-31
done
$ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied'
/home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:<p>[[!paste <span class="error">Error: no text was copied in this page</span>]]</p>
/home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:<p>[[!paste <span class="error">Error: no text was copied in this page</span>]]</p>
This error shows up only for *news.html*, but not in *news/2010-07-31* or for
the aggregation in *index.html* or its RSS and atom files.
--[[tschwinge]]

View File

@ -14,14 +14,18 @@ default when locking pages.) --[[Joey]]
>> with a specified locaction, as happens whenever a PageSpec is >> with a specified locaction, as happens whenever a PageSpec is
>> used on a page, then it should match only `currentlang()`. If it >> used on a page, then it should match only `currentlang()`. If it
>> is used without a location, as in the setup file, then no such limit. >> is used without a location, as in the setup file, then no such limit.
>>
>>> Ok. --[[intrigeri]]
>> Note that >> Note that
>> `match_currentlang` currently dies if called w/o a location -- if >> `match_currentlang` currently dies if called w/o a location -- if
>> it instead was always true w/o a location, this would just mean that >> it instead was always true w/o a location, this would just mean that
>> all pagespecs should have `and currentlang()` added to them. How to >> all pagespecs should have `and currentlang()` added to them. How to
>> implement that? All I can think of doing is wrapping >> implement that? All I can think of doing is wrapping
>> `pagespec_translate`. >> `pagespec_translate`.
>>
>>> Seems doable. --[[intrigeri]]
>> The only case I've found where it does make sense to match other >> The only case I've found where it does make sense to match other
>> language pages is on `l10n.ikiwiki.info` when listing pages that >> language pages is on `l10n.ikiwiki.info` when listing pages that
>> need translation. >> need translation.

View File

@ -138,6 +138,7 @@ discussed in *N-to-M Mapping of Input and Output Files* on
([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions
(refresh only, but not rebuild?). Perhaps missing to read in / parse some (refresh only, but not rebuild?). Perhaps missing to read in / parse some
files? files?
[[Reported|bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies]].
* [[plugins/recentchanges]] * [[plugins/recentchanges]]