From 3e8e71b34b3e91ef8f8a4b930583cf4e5b6abb9f Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Thu, 7 Aug 2014 21:00:55 +0900 Subject: [PATCH] when sync can recognize origin snapshot by name Change-Id: I9c8b875d5688a8ef5194cd0ae5981174d3410ef8 --- src/pkg_server/distribution.rb | 4 +++- src/pkg_server/packageServer.rb | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pkg_server/distribution.rb b/src/pkg_server/distribution.rb index 523a517..0342bb4 100644 --- a/src/pkg_server/distribution.rb +++ b/src/pkg_server/distribution.rb @@ -221,6 +221,8 @@ class Distribution raise RuntimeError, "Cannot create package client." end + snapshot = client.snapshot_path.split("/").pop + # parents package server check if client.pkg_hash_os.keys.empty? then @log.error("Sync process stopped by error.") @@ -350,7 +352,7 @@ class Distribution @last_sync_changes = "SYSTEM: sync parents server \n#{changes.uniq.join("\n\n")}" end - return distribution_update_flag + return distribution_update_flag, snapshot end def add_os(os) diff --git a/src/pkg_server/packageServer.rb b/src/pkg_server/packageServer.rb index 9cb6cf5..950c938 100644 --- a/src/pkg_server/packageServer.rb +++ b/src/pkg_server/packageServer.rb @@ -315,10 +315,9 @@ class PackageServer end begin - ret = distribution.sync(mode, snapshot) - - if ret then - distribution.generate_snapshot("", "", false, distribution.last_sync_changes) + update, snapshot = distribution.sync(mode, snapshot) + if update then + distribution.generate_snapshot("sync_#{snapshot}", "", false, distribution.last_sync_changes) end @log.output( "package server [#{@id}]'s distribution [#{dist_name}] has been synchronized.", Log::LV_USER ) -- 2.34.1