From: jiil.hyoun Date: Tue, 12 Mar 2013 02:03:00 +0000 (+0900) Subject: [Title] remove client config accesses X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d89049771af104c821aeeadfd5822774a0ee2645;p=sdk%2Ftools%2Fsdk-build.git [Title] remove client config accesses [Type] Enhancement [Module] Toolchain / [Priority] Minor [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: Iad6fe96d398800cc00a48c4b3199c2c20c2dd87b --- diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb index bb94695..78e4fe3 100644 --- a/src/pkg_server/client.rb +++ b/src/pkg_server/client.rb @@ -94,14 +94,6 @@ class Client # if client should access remote server, set server information if access_svr then - # if server address is nil, get a previous server address - if server_addr.nil? then - server_addr = get_default_server_addr() - if not server_addr.nil? then - @log.info "Get default server address from config file [#{server_addr}]" - end - end - if not server_addr.nil? then # chop server address, if end with "/" if server_addr.strip.end_with? "/" then server_addr = server_addr.chop end @@ -209,14 +201,7 @@ class Client end end - $update_mutex.synchronize do - if not create_default_config(@server_addr) then - @log.warn "Config file can not be created." - else - @log.info "Config file is created." - end - @log.info "Update package list from \"#{@server_addr}\".. OK" - end + @log.info "Update package list from \"#{@server_addr}\".. OK" return true end @@ -835,61 +820,12 @@ class Client return update_pkgs end - public - def get_default_server_addr() - filepath = "#{CONFIG_PATH}/config" - server_addr = nil - - if not File.exist? filepath then return nil end - - #if not File.exist? filepath then create_default_config(nil) end - #if not File.exist? filepath then - # @log.error "There is no default server address in #{filepath}" - # return nil - #end - - File.open filepath, "r" do |f| - f.each_line do |l| - if l.strip.start_with? "DEFAULT_SERVER_ADDR :" then - server_addr = l.split("DEFAULT_SERVER_ADDR :")[1].strip - break - else next end - end - end - - #if server_addr.nil? then create_default_config(DEFAULT_SERVER_ADDR) end - return server_addr - end - public # get default path for installing def get_default_inst_dir() return Dir.pwd end - private - # create default config file (Utils::HOME/.build_tools/client/config) - def create_default_config(server_addr) - if server_addr.nil? then - return false - end - - filepath = "#{CONFIG_PATH}/config" - #if server_addr.nil? then server_addr = DEFAULT_SERVER_ADDR end - - if File.exist? filepath then - FileUtils.rm_f(filepath) - end - - if server_addr.strip.end_with? "/" then server_addr = server_addr.chop end - - File.open(filepath, "a+") do |file| - file.puts "DEFAULT_SERVER_ADDR : #{server_addr}" - end - - return true - end - public # uninstall package # trace : if true, uninstall all dependent packages