From: hataejun <taejun.ha@samsung.com>
Date: Thu, 11 Oct 2012 01:50:11 +0000 (+0900)
Subject: [Title] update package server sync using snapshot
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f2184bdfba60f0f365195b966faf2604ce053b6;p=sdk%2Ftools%2Fsdk-build.git

[Title] update package server sync using snapshot
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/pkg-svr b/pkg-svr
index 3e3d597..405b185 100755
--- a/pkg-svr
+++ b/pkg-svr
@@ -67,7 +67,7 @@ begin
 	when "gen-snapshot"
 		server.generate_snapshot( option[:snaps][0], option[:dist], option[:bsnap] ) 
 	when "sync"
-		server.sync( option[:dist], option[:force] )
+		server.sync( option[:dist], option[:force], option[:snaps][0] )
 	when "add-dist"
 		server.add_distribution( option[:dist], option[:url], option[:clone] )
 	when "add-os"
diff --git a/src/pkg_server/distribution.rb b/src/pkg_server/distribution.rb
index 0e6d244..182e808 100644
--- a/src/pkg_server/distribution.rb
+++ b/src/pkg_server/distribution.rb
@@ -189,7 +189,7 @@ class Distribution
 		return name
 	end  
 
-	def sync(force) 
+	def sync(force, snapshot = "") 
 		pkg_list_update_flag = false
 		archive_update_flag = false
 		distribution_update_flag = false
@@ -205,7 +205,12 @@ class Distribution
 		end
 
 		# generate client class
-		client = Client.new( @server_url, "#{@location}/binary", @log )
+		if snapshot.nil? or snapshot.empty? then
+			server_url = @server_url
+		else
+			server_url = "#{@server_url}/snapshots/#{snapshot}"
+		end
+		client = Client.new( server_url, "#{@location}/binary", @log )
 
 		# update os list
 		add_os_list = client.support_os_list - @support_os_list
diff --git a/src/pkg_server/packageServer.rb b/src/pkg_server/packageServer.rb
index 146b35f..f443315 100644
--- a/src/pkg_server/packageServer.rb
+++ b/src/pkg_server/packageServer.rb
@@ -279,7 +279,7 @@ class PackageServer
 		return snapshot_name
 	end
 
-	def sync( dist_name, mode )
+	def sync( dist_name, mode, snapshot = "" )
 		@log.info "sync from server"
 		distribution = get_distribution( dist_name ) 
        
@@ -288,7 +288,7 @@ class PackageServer
 			return
 		end
 
-		ret = distribution.sync(mode)
+		ret = distribution.sync(mode, snapshot)
 		if ret then
 			distribution.generate_snapshot("", "", false, distribution.last_sync_changes)
 		end
diff --git a/src/pkg_server/serverOptParser.rb b/src/pkg_server/serverOptParser.rb
index fed7ace..8c86fc3 100644
--- a/src/pkg_server/serverOptParser.rb
+++ b/src/pkg_server/serverOptParser.rb
@@ -132,7 +132,7 @@ def option_parse
         + "\t" + "pkg-svr remove-pkg -n <server name> -d <distribution> -P <package name list> [-o <os>] " + "\n" \
         + "\t" + "pkg-svr remove-snapshot -n <server name> -d <distribution> -s <snapshot list>" + "\n" \
         + "\t" + "pkg-svr gen-snapshot -n <server name> -d <distribution> -s <snapshot name> [-b <base snapshot name>] " + "\n"  \
-        + "\t" + "pkg-svr sync -n <server name> -d <distribution> [--force] " + "\n"  \
+        + "\t" + "pkg-svr sync -n <server name> -d <distribution> -s <snapshot_name> [--force] " + "\n"  \
         + "\t" + "pkg-svr clean -n <server name> -d <distribution> [-s <snapshot list>] " + "\n" \
         + "\t" + "pkg-svr start -n <server name> -p <port> [-w <password>]" + "\n" \
         + "\t" + "pkg-svr stop -n <server name> -p <port> [-w <password>]" + "\n" \