diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 18:26:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 18:26:14 -0400 |
| commit | e630e7507ea253680750e670d7d213bc5ca3e57a (patch) | |
| tree | 0fa0e63c800a7826f26f78d39de907d61138d99c | |
| parent | fda61c9349f6420f331c8c424177f2b1f3c04100 (diff) | |
Avoid troublesome abs_path calls in wrapper setup
As documented in the forum post.
| -rw-r--r-- | IkiWiki/Wrapper.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/forum/Allow_overriding_of_symlink_restriction.mdwn | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 79b9eb3e3..6dc25403e 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -4,14 +4,14 @@ package IkiWiki; use warnings; use strict; -use Cwd q{abs_path}; +use File::Spec; use Data::Dumper; use IkiWiki; sub gen_wrapper () { #{{{ - $config{srcdir}=abs_path($config{srcdir}); - $config{destdir}=abs_path($config{destdir}); - my $this=abs_path($0); + $config{srcdir}=File::Spec->rel2abs($config{srcdir}); + $config{destdir}=File::Spec->rel2abs($config{destdir}); + my $this=File::Spec->rel2abs($0); if (! -x $this) { error(sprintf(gettext("%s doesn't seem to be executable"), $this)); } diff --git a/debian/changelog b/debian/changelog index 86a770357..ca318e815 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low (Simon McVittie) * Really fix bug with links to pages with names containing colons. Previous fix mised a few cases. + * Avoid troublesome abs_path calls in wrapper setup. -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 diff --git a/doc/forum/Allow_overriding_of_symlink_restriction.mdwn b/doc/forum/Allow_overriding_of_symlink_restriction.mdwn index bd94811df..069a18f30 100644 --- a/doc/forum/Allow_overriding_of_symlink_restriction.mdwn +++ b/doc/forum/Allow_overriding_of_symlink_restriction.mdwn @@ -132,6 +132,4 @@ like this being accepted before I bothered. >> hrm. I might see if <code> File::Spec->rel2abs( $path ) ; </code> will give absolute an path without expanding symlinks. >>> Patch using rel2abs() works well - it no longer expands symlinks. -> I suppose you could do the same thing with `$this`, but it does not sound -> like it has caused you problems anyway. -> --[[Joey]] +>>>> That patch is applied now. --[[Joey]] |