From 0eccef0ac4b6217d4ea26fa2040b32fe69e6985b Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Wed, 21 Aug 2013 17:28:05 +0900 Subject: [PATCH] [Title] fix git commit id check [Type] Bugfix [Module] Toolchain / [Priority] Major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I3e82c9c47a35d2f49857dc41e8d8795882681c8d --- src/build_server/BuildServerException.rb | 1 + src/build_server/GitBuildJob.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/build_server/BuildServerException.rb b/src/build_server/BuildServerException.rb index d18143f..7bd8133 100644 --- a/src/build_server/BuildServerException.rb +++ b/src/build_server/BuildServerException.rb @@ -41,6 +41,7 @@ class BuildServerException < Exception "ERR110" => "Initializing sub jobs failed!", "ERR111" => "Git clone failed!!", "ERR112" => "Git checkout failed!!", + "ERR113" => "Git reset failed!!", "ERR200" => "Unmet dependency found!", "ERR201" => "Creating job builder failed!", diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb index 84aa21e..b9db0cf 100644 --- a/src/build_server/GitBuildJob.rb +++ b/src/build_server/GitBuildJob.rb @@ -312,8 +312,12 @@ class GitBuildJob < BuildJob if not git_cmd("reset --hard #{@git_commit}", git_path, @log) then @log.warn( "Failed on \"git reset --hard #{@git_commit}\"", Log::LV_USER) FileUtils.rm_rf git_path - @git_commit = nil - @git_commit = get_source_code_internal() + if not git_cmd("clone #{@git_repos}", cache_path, @log) then + raise BuildServerException.new("ERR111"), "git clone #{@git_repos}" + end + if not git_cmd("reset --hard #{@git_commit}", git_path, @log) then + raise BuildServerException.new("ERR113"), "git reset --hard #{@git_commit}" + end end end -- 2.34.1