parent
0017d477fc
commit
fb802f8d2d
|
@ -248,7 +248,7 @@ sub srcfile ($) { #{{{
|
||||||
|
|
||||||
return "$config{srcdir}/$file" if -e "$config{srcdir}/$file";
|
return "$config{srcdir}/$file" if -e "$config{srcdir}/$file";
|
||||||
return "$config{underlaydir}/$file" if -e "$config{underlaydir}/$file";
|
return "$config{underlaydir}/$file" if -e "$config{underlaydir}/$file";
|
||||||
error("internal error: $file cannot be found");
|
error("internal error: $file cannot be found in $config{srcdir} or $config{underlaydir}");
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub readfile ($;$$) { #{{{
|
sub readfile ($;$$) { #{{{
|
||||||
|
|
|
@ -27,8 +27,10 @@ ikiwiki (1.50) UNRELEASED; urgency=low
|
||||||
[ Joey Hess ]
|
[ Joey Hess ]
|
||||||
* Add postformtext parameter to inline.
|
* Add postformtext parameter to inline.
|
||||||
* Internal version number and installdir substitutions were lost, fix.
|
* Internal version number and installdir substitutions were lost, fix.
|
||||||
|
* Apply patch from Ethan to improve an error message that should never
|
||||||
|
happen.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Fri, 13 Apr 2007 14:40:28 -0400
|
-- Joey Hess <joeyh@debian.org> Sat, 14 Apr 2007 16:06:01 -0400
|
||||||
|
|
||||||
ikiwiki (1.49) unstable; urgency=low
|
ikiwiki (1.49) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
Just a one-liner patch to make srcfile more descriptive when it fails. --Ethan
|
|
||||||
|
|
||||||
<pre>
|
|
||||||
Index: IkiWiki.pm
|
|
||||||
===================================================================
|
|
||||||
--- IkiWiki.pm (revision 3194)
|
|
||||||
+++ IkiWiki.pm (working copy)
|
|
||||||
@@ -247,7 +247,7 @@
|
|
||||||
|
|
||||||
return "$config{srcdir}/$file" if -e "$config{srcdir}/$file";
|
|
||||||
return "$config{underlaydir}/$file" if -e "$config{underlaydir}/$file";
|
|
||||||
- error("internal error: $file cannot be found");
|
|
||||||
+ error("internal error: $file cannot be found in $config{srcdir} or $config{underlaydir}");
|
|
||||||
} #}}}
|
|
||||||
|
|
||||||
sub readfile ($;$$) { #{{{
|
|
||||||
</pre>
|
|
Loading…
Reference in New Issue