[Title] change puts to raise for error handling

[Type] Enhancement
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ic80442ebf131f75b045876dfb1777e72956bc1a3

diff --git a/src/build_server/BuildClientOptionParser.rb b/src/build_server/BuildClientOptionParser.rb
index 005db890fd6f3b70c99c9b27dc7c0de5f260402d..f75afbb2a19e9db997d82d2dfc03b750659eca6d 100644 (file)
--- a/src/build_server/BuildClientOptionParser.rb
+++ b/src/build_server/BuildClientOptionParser.rb
@@ -129,8 +129,7 @@ def option_parse
         options[:os] = nil
            opts.on( '-o', '--os <operating system>', 'target operating system: ubuntu-32/ubuntu-64/windows-32/windows-64/macos-64' ) do |os|
                        if not Utils.multi_argument_test( os, "," ) then
-                               puts "OS variable parsing error : #{os}"
-                               exit
+                               raise ArgumentError, "OS variable parsing error : #{os}"
                        end
             options[:os] = os
         end

diff --git a/src/build_server/BuildServerOptionParser.rb b/src/build_server/BuildServerOptionParser.rb
index c641c222ce8cf44afb55214846c9172b842d4a52..14be325103a253888ac656c8788f876834cb1e7d 100644 (file)
--- a/src/build_server/BuildServerOptionParser.rb
+++ b/src/build_server/BuildServerOptionParser.rb
@@ -151,8 +151,7 @@ def option_parse
         options[:os] = nil
                opts.on( '-o', '--os <target os list>', 'ex) linux-32,windows-32' ) do|os|
                        if not Utils.multi_argument_test( os, "," ) then
-                               puts "OS variable parsing error : #{os}"
-                               exit
+                               raise ArgumentError, "OS variable parsing error : #{os}"
                        end
             options[:os] = os
         end

diff --git a/src/pkg_server/serverOptParser.rb b/src/pkg_server/serverOptParser.rb
index 15904668a69da24fde0cd6795c8b0d5280a5944d..1483fccb1c8b960e2dc7c2220a46fa6308364426 100644 (file)
--- a/src/pkg_server/serverOptParser.rb
+++ b/src/pkg_server/serverOptParser.rb
@@ -164,8 +164,7 @@ def option_parse
                
                opts.on( '-P', '--pkgs <package file list>', 'package file path list' ) do|pkgs|
                        if not Utils.multi_argument_test( pkgs, "," ) then
-                               puts "Package variable parsing error : #{pkgs}"
-                               exit
+                               raise ArgumentError, "Package variable parsing error : #{pkgs}"
                        end
             list = pkgs.tr(" \t","").split(",")
             list.each do |l|
@@ -176,8 +175,7 @@ def option_parse
                
                opts.on( '-s', '--snapshot <snapshot>', 'a snapshot name or snapshot list' ) do|snaplist|
                        if not Utils.multi_argument_test( snaplist, "," ) then
-                               puts "Snapshot variable parsing error : #{snaplist}"
-                               exit
+                               raise ArgumentError, "Snapshot variable parsing error : #{snaplist}"
                        end
             options[:snaps] = snaplist.split(",")
         end