remove white space of upgrade

Change-Id: I62614673fb69be47321bbc88a6b593149da5225b

diff --git a/upgrade b/upgrade
index 7007d1887240871ff96d00ae40449ecfd5333529..b5659d34d55c2afc48430d3c97447f4c90cdd361 100755 (executable)
--- 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 <dibs path> -S -t <server type> -n <server name> -p <server port> -D <distribution name>" + "\n"
-               end
-       else
-       if options[:locate].nil? or options[:url].nil? then
-                       raise ArgumentError, "upgrade -u <package server url> [-l <dibs path>]"  + "\n"
-               end
+    if options[:start] then
+        if options[:locate].nil? or options[:type].nil? or options[:name].nil? then
+            raise ArgumentError, "upgrade -l <dibs path> -S -t <server type> -n <server name> -p <server port> -D <distribution name>" + "\n"
+        end
+    else
+        if options[:locate].nil? or options[:url].nil? then
+            raise ArgumentError, "upgrade -u <package server url> [-l <dibs path>]"  + "\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 <dibs path>, located dibs path"
-                       puts "  -u, --url <package server url>, package server url: http://127.0.0.1/dibs/unstable"
-                       exit
+            puts "     -l, --locate <dibs path>, located dibs path"
+            puts "     -u, --url <package server 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