diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-03-31 09:40:15 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-03-31 09:40:15 -0400 |
| commit | 48ef624d3117bf5c1a175c65ce0499e1925b9114 (patch) | |
| tree | 2706e6da5cea4fa63a98c2356899bf76ca4c77fb | |
| parent | v4 v3: CHANGELOGs note on future closing of v3 & addendum to [71e8f19] in 4.0.18 (diff) | |
v4: sysenv, yamlrc cosmetic
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 483b90b8..728cd85a 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.19.orig.tar.xz sisu_4.0.19.orig.tar.xz sisu_4.0.19-1.dsc +* v4: sysenv, yamlrc, minor + %% 4.0.18.orig.tar.xz (2013-03-29:12/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.18 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.18-1 diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index d77672a6..d9f2a080 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -336,18 +336,20 @@ module SiSU_Env break else f=S_CONF[:rc_yml] - if FileTest.exist?("#{v}/#{f}") + p_f="#{v}/#{f}" + if FileTest.exist?(p_f) require 'yaml' @@sisurc_path=v - @@rc=YAML::load(File::open("#{@@sisurc_path}/#{f}")) + @@rc=YAML::load(File::open(p_f)) break end unless @@rc f='sisurc.yaml' - if FileTest.exist?("#{v}/#{f}") + p_f="#{v}/#{f}" + if FileTest.exist?(p_f) require 'yaml' @@sisurc_path=v - @@rc=YAML::load(File::open("#{@@sisurc_path}/#{f}")) + @@rc=YAML::load(File::open(p_f)) break end end |