From d04375242b50b4553e36816ce0d2cac9a7e44702 Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Wed, 27 Aug 2014 04:31:34 +0900 Subject: [PATCH] remove white space of upgrade Change-Id: I62614673fb69be47321bbc88a6b593149da5225b --- upgrade | 58 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/upgrade b/upgrade index 7007d18..b5659d3 100755 --- a/upgrade +++ b/upgrade @@ -39,14 +39,14 @@ require "log.rb" require "client" def option_error_check( options ) - if options[:start] then - if options[:locate].nil? or options[:type].nil? or options[:name].nil? then - raise ArgumentError, "upgrade -l -S -t -n -p -D " + "\n" - end - else - if options[:locate].nil? or options[:url].nil? then - raise ArgumentError, "upgrade -u [-l ]" + "\n" - end + if options[:start] then + if options[:locate].nil? or options[:type].nil? or options[:name].nil? then + raise ArgumentError, "upgrade -l -S -t -n -p -D " + "\n" + end + else + if options[:locate].nil? or options[:url].nil? then + raise ArgumentError, "upgrade -u [-l ]" + "\n" + end end end @@ -93,13 +93,13 @@ def option_parse options[:port] = port.strip.to_i end - opts.on( '-h', '--help', 'display this information' ) do + opts.on( '-h', '--help', 'display this information' ) do puts opts.banner - puts " -l, --locate , located dibs path" - puts " -u, --url , package server url: http://127.0.0.1/dibs/unstable" - exit + puts " -l, --locate , located dibs path" + puts " -u, --url , package server url: http://127.0.0.1/dibs/unstable" + exit end - end + end optparse.parse! @@ -191,18 +191,18 @@ begin log.info("Package Server : [#{pkg_svr_url}]", Log::LV_USER) log.info("DIBS Path : [#{dibs_path}]", Log::LV_USER) - # Download DIBS Package - client = Client.create( pkg_svr_url, NEW_VER_PATH, log) - if client.nil? then - log.error("Cannot create package client!", Log::LV_USER) - exit(1) - end - client.update() - client.install( DIBS_PKG_NAME, Utils::HOST_OS, true, true) - if not File.exist? "#{NEW_VER_PATH}/tools/dibs" then - log.error("Not installed package error.", Log::LV_USER) - exit(1) - end + # Download DIBS Package + client = Client.create( pkg_svr_url, NEW_VER_PATH, log) + if client.nil? then + log.error("Cannot create package client!", Log::LV_USER) + exit(1) + end + client.update() + client.install( DIBS_PKG_NAME, Utils::HOST_OS, true, true) + if not File.exist? "#{NEW_VER_PATH}/tools/dibs" then + log.error("Not installed package error.", Log::LV_USER) + exit(1) + end # Copy Current path if File.exist? "#{dibs_path}" then @@ -217,10 +217,10 @@ begin if svr_type.eql? "BUILDSERVER" then # get friends server information build_server = BuildServerController.get_server(svr_name) - if build_server.has_db? then - build_server.get_remote_servers().each do |svr| - ip = svr.ip - port = svr.port + if build_server.has_db? then + build_server.get_remote_servers().each do |svr| + ip = svr.ip + port = svr.port build_client = BuildCommClient.create( ip, port ) if build_client.nil? then -- 2.34.1