From 6ebb27b33e60e57ca5c3658935767995478f8d11 Mon Sep 17 00:00:00 2001
From: donghee yang <donghee.yang@samsung.com>
Date: Sat, 27 Oct 2012 12:48:42 +0900
Subject: [PATCH] [Title] Fixed package sync bug

---
 src/build_server/BuildJob.rb           |  8 -----
 src/build_server/CommonProject.rb      | 41 --------------------------
 src/build_server/GitBuildJob.rb        |  1 -
 src/build_server/PackageSync.rb        |  6 ++--
 src/build_server/RegisterPackageJob.rb | 12 --------
 5 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 3f786c5..08295f0 100644
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -493,14 +493,6 @@ class BuildJob < CommonJob
 
 
 	def progress
-		if not @log.nil? then
-			if @project.nil? or @project.get_latest_log_cnt.nil? then
-				return "--% (#{log.cnt.to_s} lines) "
-			else
-				return ( ( @log.cnt * 100 ) / @project.get_latest_log_cnt ).to_s + "%"
-			end
-		end
-		# if log is nil then can't figure progress out
 		return ""
 	end
 
diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index c22c1b9..97fc30b 100644
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -49,8 +49,6 @@ class CommonProject
 		else
 			@path = "#{@server.path}/projects/#{@dist_name}/#{@name}"
 		end
-		@extra_infos = {}
-		read_ext_info
 	end
 
 
@@ -82,45 +80,6 @@ class CommonProject
 	end
 
 
-	def write_ext_info
-		# write to file
-		info_file = "#{@path}/extra"
-		File.open( info_file, "w" ) do |f|
-			@extra_infos.each do  |key,value|
-				f.puts "#{key} : #{value}"
-			end
-		end
-	end
-
-
-	# set extra info
-	def read_ext_info
-		info_file = "#{@path}/extra"
-		if not File.exists? info_file then return end
-		File.open( info_file, "r" ) do |f|
-			while (not f.gets and line = f.gets.split(":"))
-				if not line[1].nil? then
-					@extra_infos[line[0].strip] = line[1].strip
-				end
-			end
-		end
-	end
-
-
-	def set_log_cnt( cnt )
-		@extra_infos["Latest_log_count"] = cnt.to_s
-	end
-
-
-	def get_latest_log_cnt
-		result = @extra_infos["Latest_log_count"]
-		if not result.nil? then
-			return result.to_i
-		end
-		return nil
-	end
-
-
 	def set_source_info(info)
 		@source_info = info
 	end
diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb
index dfd0da5..8b97de4 100644
--- a/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@ -64,7 +64,6 @@ class GitBuildJob < BuildJob
 			@project.save_source_info( @pkginfo.get_version(), @git_commit)
 			@project.save_package_info_from_manifest( @pkginfo.get_version(),
 				"#{@source_path}/package/pkginfo.manifest", @os)
-			@project.set_log_cnt( @log.cnt )
 			@project.write_ext_info
 
 			# clean up
diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb
index 523a0bb..0aa83bc 100644
--- a/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@ -89,15 +89,15 @@ class PackageSyncAction < Action
 		# check update
 		pkgs = check_package_update
 
+		# request to register
+		registered_jobs = []
+
 		# if updates are found, download them
 		downloaded_files = []
 		pkgs.each do  |pkg|
 			pkg_name=pkg[0]; os=pkg[1]; prj=pkg[2]
 
 			downloaded_files = @pkgsvr_client.download(pkg_name, os, false)
-
-			# request to register
-			registered_jobs = []
 			downloaded_files.each do  |file_path|
 				@server.log.info "Creating new job for registering \"#{file_path}\""
 				new_job = prj.create_new_job_from_local_file( file_path )
diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 8d66523..83bb347 100644
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -221,10 +221,6 @@ class RegisterPackageJob < CommonJob
 		else
 			# clean up
 			@server.cleaner.clean(@id)
-			if not @project.nil? then
-				@project.set_log_cnt( @log.cnt )
-				@project.write_ext_info
-			end
 		end
 
 		# close logger
@@ -349,14 +345,6 @@ class RegisterPackageJob < CommonJob
 
 
 	def progress
-		if not @log.nil? then
-			if @project.nil? or @project.get_latest_log_cnt.nil? then
-				return "--% (#{log.cnt.to_s} lines) "
-			else
-				return ( ( @log.cnt * 100 ) / @project.get_latest_log_cnt ).to_s + "%"
-			end
-		end
-		# if log is nil then can't figure progress out
 		return ""
 	end
 
-- 
2.34.1