summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-08-20 22:56:42 +0000
committerRalph Amissah <ralph@amissah.com>2014-08-20 22:56:43 +0000
commit0f1666f82e876509478675f10ac2b0d237597779 (patch)
treefd98f83b92d96c43b86ed50c9a8f65a37950e55c
parentv5 v6: ao, book index related (diff)
downloadsisu-0f1666f82e876509478675f10ac2b0d237597779.zip
sisu-0f1666f82e876509478675f10ac2b0d237597779.tar.xz
v5 v6: hub options, introduce "error override" --no-stop or --errors-as-warnings
-rw-r--r--data/doc/sisu/CHANGELOG_v52
-rw-r--r--data/doc/sisu/CHANGELOG_v62
-rw-r--r--lib/sisu/v5/hub_options.rb6
-rw-r--r--lib/sisu/v5/utils.rb13
-rw-r--r--lib/sisu/v6/hub_options.rb6
-rw-r--r--lib/sisu/v6/utils.rb13
6 files changed, 32 insertions, 10 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 9c79565..714c6cc 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.2.orig.tar.xz
sisu_5.6.2.orig.tar.xz
sisu_5.6.2-1.dsc
+* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
+
* ao
* book index related
* ao_expand_insertions, blocked text match, adjust
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index a1b2052..8661c83 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.3.orig.tar.xz
sisu_6.2.3.orig.tar.xz
sisu_6.2.3-1.dsc
+* hub_options, introduce "error override" --no-stop or --errors-as-warnings flag
+
* ao
* book index related
* ao_expand_insertions, blocked text match, adjust
diff --git a/lib/sisu/v5/hub_options.rb b/lib/sisu/v5/hub_options.rb
index 77bb294..bc96b87 100644
--- a/lib/sisu/v5/hub_options.rb
+++ b/lib/sisu/v5/hub_options.rb
@@ -781,6 +781,12 @@ module SiSU_Commandline
@act=@@act
else
act={}
+ act[:no_stop]=if select_arr.inspect \
+ =~/"--no-stop"|"--errors-as-warnings"/
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
act[:license]=(select_arr.inspect \
=~/"--license/) \
? { bool: true, set: :on }
diff --git a/lib/sisu/v5/utils.rb b/lib/sisu/v5/utils.rb
index c5a312d..1f4e6f0 100644
--- a/lib/sisu/v5/utils.rb
+++ b/lib/sisu/v5/utils.rb
@@ -130,7 +130,10 @@ module SiSU_Utils
def set(v=nil,x=nil)
v=var(v,x)
file,path=File.basename(@file),File.dirname(@file)
- v[:c][:on] + @line + v[:c][:off] + ' ' + path + '/' "#{v[:c][:on]}#{file}#{v[:c][:off]}" + v[:m]
+ v[:c][:on] + @line + v[:c][:off] + ' ' \
+ + path + '/' \
+ + "#{v[:c][:on]}#{file}#{v[:c][:off]}" \
+ + v[:m]
end
def mark(v=nil,x=nil)
puts set(v,x)
@@ -150,9 +153,9 @@ module SiSU_Utils
def warn(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
- x= '*WARN* ' + x
+ x="\n " + '*WARN* ' + x
elsif v.is_a?(String)
- v='*WARN* ' + v
+ v="\n " + '*WARN* ' + v
x=nil
else
v,x='*WARN*',nil
@@ -162,9 +165,9 @@ module SiSU_Utils
def error(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
- x= '*ERROR* ' + x
+ x="\n " + '*ERROR* ' + x
elsif v.is_a?(String)
- v='*ERROR* ' + v
+ v="\n " + '*ERROR* ' + v
x=nil
else
v,x='*ERROR*',nil
diff --git a/lib/sisu/v6/hub_options.rb b/lib/sisu/v6/hub_options.rb
index 8130241..5625963 100644
--- a/lib/sisu/v6/hub_options.rb
+++ b/lib/sisu/v6/hub_options.rb
@@ -781,6 +781,12 @@ module SiSU_Commandline
@act=@@act
else
act={}
+ act[:no_stop]=if select_arr.inspect \
+ =~/"--no-stop"|"--errors-as-warnings"/
+ { bool: true, set: :on }
+ else
+ { bool: false, set: :na }
+ end
act[:license]=(select_arr.inspect \
=~/"--license/) \
? { bool: true, set: :on }
diff --git a/lib/sisu/v6/utils.rb b/lib/sisu/v6/utils.rb
index 7e91542..af46457 100644
--- a/lib/sisu/v6/utils.rb
+++ b/lib/sisu/v6/utils.rb
@@ -130,7 +130,10 @@ module SiSU_Utils
def set(v=nil,x=nil)
v=var(v,x)
file,path=File.basename(@file),File.dirname(@file)
- v[:c][:on] + @line + v[:c][:off] + ' ' + path + '/' "#{v[:c][:on]}#{file}#{v[:c][:off]}" + v[:m]
+ v[:c][:on] + @line + v[:c][:off] + ' ' \
+ + path + '/' \
+ + "#{v[:c][:on]}#{file}#{v[:c][:off]}" \
+ + v[:m]
end
def mark(v=nil,x=nil)
puts set(v,x)
@@ -150,9 +153,9 @@ module SiSU_Utils
def warn(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
- x= '*WARN* ' + x
+ x="\n " + '*WARN* ' + x
elsif v.is_a?(String)
- v='*WARN* ' + v
+ v="\n " + '*WARN* ' + v
x=nil
else
v,x='*WARN*',nil
@@ -162,9 +165,9 @@ module SiSU_Utils
def error(v=nil,x=nil)
if (v.is_a?(Symbol) \
and x.is_a?(String))
- x= '*ERROR* ' + x
+ x="\n " + '*ERROR* ' + x
elsif v.is_a?(String)
- v='*ERROR* ' + v
+ v="\n " + '*ERROR* ' + v
x=nil
else
v,x='*ERROR*',nil