[Title] pkg-clean bug fix

[Type] Bugfix
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ib666b640e6a4f1bebc6d8bb534d9e99f9953eb5c

diff --git a/src/build_server/BuildComm.rb b/src/build_server/BuildComm.rb
index 647d755e344df6a53fad545da24c75e7d3b341f9..8df46bfdc10a467a966d75d7b5f411f84b3335d3 100644 (file)
--- 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 8ce5a7d05fabf02eef28eeed7e935a63469660be..732afd394494592a0369872058355c78fa7a2934 100644 (file)
--- 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 b7d0ff011feae34f0752575efca6e50e76d31ed4..5f00496db30303dbfb05b69c45142546eb478604 100644 (file)
--- 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 1e9c426cd084a1ee0e3fc5c923a731c64966193b..52f2510e454fb58ba725d8ba20b71588924f805c 100644 (file)
--- 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 e54015794d6843fc44d0fc298b917845d8f1b465..d5119d7978807cd162e147fd32060c227d5d6e52 100644 (file)
--- 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