From 19c96080a7ed012d58ce3171715e14c4a19c5672 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 5 Apr 2012 14:42:26 -0400
Subject: v3: sysenv, path.style (a quick fix, review)

---
 data/doc/sisu/CHANGELOG_v3 |  4 +++-
 lib/sisu/v3/sysenv.rb      | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 9207a51a..8fe04a91 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.2.orig.tar.xz
   sisu_3.2.2-1.dsc
   sisu_3.2.2-1.debian.tar.gz
 
+  * v3: sysenv, path.style (a quick fix, review)
+
 %% 3.2.1.orig.tar.xz (2012-03-21:12/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.2.1
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.2.1-1
@@ -29,7 +31,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.1.orig.tar.xz
   99de0bf1930f7dae8feec4cc7d0809c81c89ac50c9a7c0e7974d6dc91770d82f 1382 sisu_3.2.1-1.dsc
   ef8acf443ac79122fd0da79d25ea94c659bcf8bcd4f631d58e4c1f3b94b2c788 294764 sisu_3.2.1-1.debian.tar.gz
 
-* v3, documentation sisu_commands, rearranged; update with regard to
+* v3: documentation sisu_commands, rearranged; update with regard to
   excludes; & discreet sqlite output
   * manpage
   * html (man2html)
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index 4383a893..0b3a581c 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -848,7 +848,7 @@ module SiSU_Env
       elsif @cmd =~/V/;              FileUtils::rm(@input)
       elsif @cmd !~/q/;              FileUtils::rm(@input)
       elsif @cmd =~/q/;              FileUtils::rm(@input)
-      else                          puts "\tWARN: operation ignored"
+      else                           puts "\tWARN: operation ignored"
       end
     end
   end
@@ -1852,10 +1852,11 @@ WOK
         defaults[:sisu_share]
       end
       def style
-        if (@md.opt.opt_act[:dump][:bool] \
-        &&  @md.opt.opt_act[:dump][:inst]) \
-        || (@md.opt.opt_act[:redirect][:bool] \
-        &&  @md.opt.opt_act[:redirect][:inst])
+        if @md \
+        && ((@md.opt.opt_act[:dump][:bool] \
+        &&   @md.opt.opt_act[:dump][:inst]) \
+        ||  (@md.opt.opt_act[:redirect][:bool] \
+        &&   @md.opt.opt_act[:redirect][:inst]))
           'css'
         else
          defaults[:stylesheet_stub]
-- 
cgit v1.2.3