diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-10-31 22:07:13 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-10-31 22:07:13 -0400 |
| commit | aab1394b01154c9b1f86b863d48e1752f635f6b3 (patch) | |
| tree | 79a9da9a104f5d68e1b394bbc5de07ab2363f960 /lib/sisu/v3/sysenv.rb | |
| parent | debian/changelog (3.1.1-1) (diff) | |
| parent | v3: header, bold & italic pattern matching, ignore case (possibility reinstated) (diff) | |
Merge commit 'sisu_3.1.2' into debian/sid
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index b1560c66..cb7b94df 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -4985,15 +4985,17 @@ WOK and ((! @md.nil?) \ && (defined? @md.opt) \ && (defined? @md.opt.mod) \ - && @md.opt.mod.inspect =~/--trust/) - true #security only run skins on sisupod if --trust flag is provided - else false + && @md.opt.mod.inspect !~/--trust/) + true # security only run skins on sisupod if --trust flag is provided + elsif @pwd_stub =~/^(?:doc|sisupod)$/ # consider/reconsider doc + false + else true end doc_skin,dir_skin=nil,nil if skin unless @d_sk.nil? sk_doc="doc/#{@d_sk}.rb" - skin_path.each do |v| #document skin priority 1 + skin_path.each do |v| # document skin priority 1 if FileTest.file?("#{v}/#{sk_doc}") doc_skin="#{v}/#{sk_doc}" load doc_skin @@ -5003,7 +5005,7 @@ WOK end unless doc_skin sk_dir="dir/skin_#{@pwd_stub}.rb" - skin_path.each do |v| #directory skin priority 2 + skin_path.each do |v| # directory skin priority 2 if FileTest.file?("#{v}/#{sk_dir}") dir_skin="#{v}/#{sk_dir}" load dir_skin |