diff options
author | Ralph Amissah <ralph@amissah.com> | 2008-07-12 01:08:40 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2008-07-12 01:08:40 -0400 |
commit | 90a2e2aaa5c2d1b3e64dda326c9ba453c161467c (patch) | |
tree | 9cc5315c0a02ae0470f1389fc995674d0dab8749 /lib/sisu/v0/sysenv.rb | |
parent | Updated sisu-0.67.3 (diff) | |
parent | minor fixes: remote sourcefile; processing directory; manifest info (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sysenv.rb')
-rw-r--r-- | lib/sisu/v0/sysenv.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 31f4f19f..bde769e2 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -102,7 +102,7 @@ module SiSU_Env data=Config::CONFIG['datadir'] + '/doc/sisu' m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @stub_pwd ||=@@pwd[m,1] - prcss_dir='_sisu_processing~' + prcss_dir='_sisu_processing_' prcss_dir_tmp_root="/tmp/#{prcss_dir}" prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}" if @@user @@ -2001,9 +2001,9 @@ WOK conf=if defined? @rc['default']['language']; @rc['default']['language'] else nil end - l=if pwd=~m ; pwd[m1,1] #2 directory: by visible directory name + l=if pwd=~ m; pwd[m,1] #2 directory: by visible directory name elsif conf; @rc['default']['language'] #3 config: from sisurc.yaml - else defaults[:language] #4 sisu: program default + else defaults[:language] #4 sisu: program default end #1 document: param gets SiSU_Env::Standardise_language.new(l) end |