diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-14 20:07:03 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-14 20:07:03 +0000 |
| commit | fb802f8d2d58b92fd8f47137f8b29cb3970441f3 (patch) | |
| tree | f2ab8ab2a95816742a9b364aa3d68f824036f900 | |
| parent | 0017d477fca613825981de879b2bd219bef177c5 (diff) | |
* Apply patch from Ethan to improve an error message that should never
happen.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/patchqueue/better_error_in_srcfile.mdwn | 17 |
3 files changed, 4 insertions, 19 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index f2273e07c..1c310d391 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -248,7 +248,7 @@ sub srcfile ($) { #{{{ 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 ($;$$) { #{{{ diff --git a/debian/changelog b/debian/changelog index 4afbf1b4c..5b03c7884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,10 @@ ikiwiki (1.50) UNRELEASED; urgency=low [ Joey Hess ] * Add postformtext parameter to inline. * 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 diff --git a/doc/patchqueue/better_error_in_srcfile.mdwn b/doc/patchqueue/better_error_in_srcfile.mdwn deleted file mode 100644 index 07cfd5ec0..000000000 --- a/doc/patchqueue/better_error_in_srcfile.mdwn +++ /dev/null @@ -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>
\ No newline at end of file |