From 41fa04adc1ff4666fde974c868a69cb00db783ab Mon Sep 17 00:00:00 2001 From: "jiil.hyoun" Date: Fri, 28 Sep 2012 14:49:50 +0900 Subject: [PATCH] [Title] pkg-clean bug fix [Type] Bugfix [Module] Toolchain / [Priority] Major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: Ib666b640e6a4f1bebc6d8bb534d9e99f9953eb5c --- src/build_server/BuildComm.rb | 12 ++++++------ src/build_server/BuildServer.rb | 3 ++- src/build_server/RemoteBuilder.rb | 4 ++-- src/builder/Builder.rb | 7 ++++--- src/common/package.rb | 3 ++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/build_server/BuildComm.rb b/src/build_server/BuildComm.rb index 647d755..8df46bf 100644 --- a/src/build_server/BuildComm.rb +++ b/src/build_server/BuildComm.rb @@ -1,7 +1,7 @@ require "socket" =begin - + BuildComm.rb Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. @@ -56,9 +56,9 @@ class BuildCommServer if port_open? port then raise "Port \"#{@port}\" is already in use." end - + if log.nil? then - log = Log.new(nil) + log = Log.new(".log") end # create cache dir if not nil @@ -397,10 +397,10 @@ class BuildCommClient if socket.nil? then return nil end - + if log.nil? then - log = Log.new(nil) - end + log = Log.new(".log") + end return new(socket, log) end diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index 8ce5a7d..732afd3 100644 --- a/src/build_server/BuildServer.rb +++ b/src/build_server/BuildServer.rb @@ -1,5 +1,5 @@ =begin - + BuildServer.rb Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. @@ -26,6 +26,7 @@ Contributors: - S-Core Co., Ltd =end +require 'rubygems' require 'fileutils' require 'sqlite3' $LOAD_PATH.unshift File.dirname(__FILE__) diff --git a/src/build_server/RemoteBuilder.rb b/src/build_server/RemoteBuilder.rb index b7d0ff0..5f00496 100644 --- a/src/build_server/RemoteBuilder.rb +++ b/src/build_server/RemoteBuilder.rb @@ -1,5 +1,5 @@ =begin - + RemoteBuilder.rb Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. @@ -46,7 +46,7 @@ class RemoteBuilder @ftp_port = ftp_port @ftp_username = ftp_username @ftp_passwd = ftp_passwd - @log = Log.new(nil) + @log = Log.new(".log") @job = nil end diff --git a/src/builder/Builder.rb b/src/builder/Builder.rb index 1e9c426..52f2510 100644 --- a/src/builder/Builder.rb +++ b/src/builder/Builder.rb @@ -51,7 +51,7 @@ class Builder if not log_path.nil? then @log = Log.new(log_path) else - @log = Log.new(nil) + @log = Log.new(".log") end end @@ -432,7 +432,7 @@ VERSION=\"#{version}\" " contents = contents + lines lines = [] end - end + end end # generate shell script @@ -471,7 +471,8 @@ VERSION=\"#{version}\" " pid, status = @job.execute_command( build_command ) else pid, status = Utils.execute_shell_with_log( build_command, @log.path ) - end + end + if status.exitstatus != 0 then @log.error( "Failed on build script: \"#{target}\"", Log::LV_USER) return false diff --git a/src/common/package.rb b/src/common/package.rb index e540157..d5119d7 100644 --- a/src/common/package.rb +++ b/src/common/package.rb @@ -27,7 +27,7 @@ Contributors: =end class Package - attr_accessor :package_name, :label, :version, :os, :build_host_os, :maintainer, :attribute, :install_dep_list, :build_dep_list, :source_dep_list, :conflicts, :source, :src_path, :path, :origin, :checksum, :size, :description, :os_list, :custom + attr_accessor :package_name, :label, :version, :os, :build_host_os, :maintainer, :attribute, :install_dep_list, :build_dep_list, :source_dep_list, :conflicts, :source, :src_path, :path, :origin, :checksum, :size, :description, :os_list, :custom, :change_log def initialize (package_name) @package_name = package_name @label = "" @@ -49,6 +49,7 @@ class Package @size = "" @description = "" @custom = "" + @change_log = {} end def print -- 2.34.1