diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-02-06 21:21:41 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-02-06 21:21:41 -0500 |
| commit | 83a88c716a3577de0667f49cce77699790eb3686 (patch) | |
| tree | 5b42c97a8656e4c7fb5b6e3bdcd568261dd9193d | |
| parent | v4: utils, SiSU_Utils::Path.new.base_markup provides base markup directory (diff) | |
v4: sysenv, webserv dir (output dir), ensure is determined from base markup dir
* where relative path provided (remove possibility of path expansion being done
from a language sub-directory), fix
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 4 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 9cdd4885..83692be3 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -33,6 +33,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.6.orig.tar.xz files) and sisu resource configuration sub-directory, if any (./_sisu) (identifies when needed in runtime) +* v4: sysenv, webserv dir (output dir), ensure it is determined from base markup + dir where relative path provided (remove possibility of it being done from a + language sub-directory), fix + %% 4.0.5.orig.tar.xz (2013-02-03:04/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.5 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.5-1 diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 2ac8897f..728f4fc4 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -1941,7 +1941,11 @@ WOK man_path=if @@man_path.nil? man_path=if defined? @rc['webserv']['path'] \ and @rc['webserv']['path'] =~/\S\S+/ + pwd=Dir.pwd + Dir.chdir(SiSU_Utils::Path.new.base_markup) man_path=@@man_path=File.expand_path(@rc['webserv']['path']) + Dir.chdir(pwd) + man_path else defaults[:webserv_path] end else @@man_path |