From 5af7a5e47fff51efd7602bc0f240e64cd6f33b95 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 6 May 2012 23:48:53 -0400
Subject: v3: rescue & error warnings, some touched

---
 lib/sisu/v3/hub.rb | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v3/hub.rb')

diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb
index ce8446e5..34e6e69f 100644
--- a/lib/sisu/v3/hub.rb
+++ b/lib/sisu/v3/hub.rb
@@ -272,22 +272,22 @@ module SiSU
       @@n_do=0
     end
     def remote_put_base_site_rsync                         # -CR
-p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
+p "#{__LINE__}:#{__FILE__}" if @opt =~/M/
       require_relative 'remote'                         # remote.rb
       SiSU_Remote::Put.new(@opt).rsync_base
     end
     def remote_put_base_site_rsync_match                   # -CCRZ
-p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
+p "#{__LINE__}:#{__FILE__}" if @opt =~/M/
       require_relative 'remote'                         # remote.rb
       SiSU_Remote::Put.new(@opt).rsync_base_sync
     end
     def remote_put_base_site                               # -Cr
-p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
+p "#{__LINE__}:#{__FILE__}" if @opt =~/M/
       require_relative 'remote'                         # remote.rb
       SiSU_Remote::Put.new(@opt).scp_base
     end
     def remote_put_base_site_all                           # -CCr
-p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
+p "#{__LINE__}:#{__FILE__}" if @opt =~/M/
       require_relative 'remote'                         # remote.rb
       SiSU_Remote::Put.new(@opt).scp_base_all
     end
@@ -469,7 +469,9 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
               SiSU_Remote::Get.new(@opt,@get_p).sisupod
             end
           rescue
-            SiSU_Errors::InfoError.new($!,$@,@opt,@fns).error #ok
+            SiSU_Errors::InfoError.new($!,$@,@opt,@fns).error do
+              __LINE__.to_s + ':' + __FILE__
+            end
             @retry_count +=1
             retry unless @retry_count > 1
           ensure
@@ -673,7 +675,8 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         if @opt.mod.inspect =~/--about/ \
         and not @opt.what.empty?
           SiSU_Help::Help.new(@opt.what,'color_off').help_request
-        else SiSU_Help::Help.new('list','color_off').help_request
+        else
+          SiSU_Help::Help.new('list','color_off').help_request
         end
       elsif  @opt.mod.inspect =~/--sitemaps/               #% sitemaps
         require_relative 'sitemaps'                     # sitemaps.rb
@@ -687,9 +690,12 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
           if @opt.mod.inspect =~/--help/ \
           and not @opt.what.empty?
             SiSU_Help::Help.new(@opt.what).help_request
-          elsif @opt.mod.inspect =~/--help/; SiSU_Help::Help.new('list').help_request
-          else SiSU_Help::Help.new('env',@opt).sisu_version
-            tell=SiSU_Screen::Ansi.new('',"  for HELP type:\n\tsisu --help [help request]\n\tman sisu\n  or see the system or online documentation on SiSU:\n    #{Config::CONFIG['datadir']}/doc/sisu/\n    <http://www.jus.uio.no/sisu/>\n    <http://sisudoc.org/>"); tell.puts_grey
+          elsif @opt.mod.inspect =~/--help/
+            SiSU_Help::Help.new('list').help_request
+          else
+            SiSU_Help::Help.new('env',@opt).sisu_version
+            tell=SiSU_Screen::Ansi.new('',"  for HELP type:\n\tsisu --help [help request]\n\tman sisu\n  or see the system or online documentation on SiSU:\n    #{Config::CONFIG['datadir']}/doc/sisu/\n    <http://www.jus.uio.no/sisu/>\n    <http://sisudoc.org/>")
+            tell.puts_grey
           end
         end
       end
-- 
cgit v1.2.3