diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-07-07 20:09:04 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-07-07 20:09:04 -0400 |
| commit | 5a900258ae239b545d6c33e4643858a316f3c59b (patch) | |
| tree | 044fdd13d3b9d16b6952a2aa3c98c3a80a9bb4df /lib/sisu/v1/sysenv.rb | |
| parent | Renaming debian manpages to match name of the meta packages. (diff) | |
| parent | some cleaning of default outputs, ongoing (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v1/sysenv.rb')
| -rw-r--r-- | lib/sisu/v1/sysenv.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index a55b03cc..519c0f9f 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -2648,10 +2648,10 @@ WOK def get_version @version={} @pwd=ENV['PWD'] - yst_etc="#{defaults[:sisu_etc]}/#{SiSU_version_dir}/version.yml" + yst_ver="#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml" lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':') @@lib_path ||=lib_path - if File.exist?(yst_etc); @version=YAML::load(File::open(yst_etc)) #unless @@noyaml + if File.exist?(yst_ver); @version=YAML::load(File::open(yst_ver)) #unless @@noyaml end @version end |