From: donghee yang <donghee.yang@samsung.com>
Date: Fri, 5 Oct 2012 10:17:29 +0000 (+0900)
Subject: [Title] Fixed PackageSync for multi distribution
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a3fa167e2f9cdde345430e5b9d5cf54d2c8fde1;p=sdk%2Ftools%2Fsdk-build.git

[Title] Fixed PackageSync for multi distribution
---

diff --git a/src/build_server/BuildServerOptionParser.rb b/src/build_server/BuildServerOptionParser.rb
index b9bb76c..f385807 100644
--- a/src/build_server/BuildServerOptionParser.rb
+++ b/src/build_server/BuildServerOptionParser.rb
@@ -221,11 +221,6 @@ def option_parse
             options[:url] = url 
         end
 
-        options[:proxy] = nil
-		opts.on( '--proxy <proxy url>', 'proxy url: http://172.21.111.100:2222' ) do|proxy|
-            options[:proxy] = proxy
-        end
-
 		opts.on( '-d', '--address <server address>', 'server address: 127.0.0.1:2224' ) do|domain|
             options[:domain] = domain
         end
diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb
index f008f4f..c3bd3fd 100644
--- a/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@ -38,15 +38,14 @@ require "ScheduledActionHandler.rb"
 class PackageSyncAction < Action
 	@@new_id = 0
 	
-	def initialize( time, url, proxy, server, dist_name = "BASE" )
+	def initialize( time, url, dist_name, server )
 		super(time, server.pkg_sync_period)
 		my_id = @@new_id
 		@@new_id += 1
 		@pkgsvr_url = url
-		@proxy = proxy
+		@dist_name = dist_name
 		@server = server
 		@pkgsvr_client = nil
-		@dist_name = dist_name
 		@main_client = nil
 		@sync_root = "#{@server.path}/sync/#{my_id}"
 		@download_path = "#{@sync_root}/remote"
@@ -179,9 +178,9 @@ class PackageServerSynchronizer
 
 		time = Time.new + 60
 		@server.remote_pkg_servers.each { |entry|
-			url=entry[0]; proxy=entry[1]
-			@handler.register( PackageSyncAction.new(time, url, proxy, @server) )
-			@server.log.info "Registered package-sync action for server \"#{url}\""
+			url=entry[0]; dist_name=entry[1]
+			@handler.register( PackageSyncAction.new(time, url, dist_name, @server) )
+			@server.log.info "Registered package-sync action!: #{dist_name} <= \"#{url}\""
 		}
 
 		# start handler