aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2011-10-31 21:51:53 -0400
committerRalph Amissah <ralph@amissah.com>2011-10-31 21:51:53 -0400
commit87608df71506374ba6636353ebb16c6a2160f8bc (patch)
treea3b95147336e9ea755b52d9ff3da98f0ad1e4b79
parentv3: conf/convert/modify.rb minor fixes (diff)
v3: sysenv, skins, a fix
-rw-r--r--data/doc/sisu/CHANGELOG_v33
-rw-r--r--lib/sisu/v3/sysenv.rb12
2 files changed, 10 insertions, 5 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 8d5639f5..bbc88529 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.2.orig.tar.xz
sisu_3.1.2-1.dsc
sisu_3.1.2-1.debian.tar.gz
+ * sysenv, skins, a fix
+ [return to, identify sisupod more definitively]
+
* markup-samples, Free as in Freedom 2.0
* made use of old book index, better than none
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