[Title] change log format change

[Type] Enhancement
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I5d57e164e9fdab2fe49ed2c208cee3b845c752ff

diff --git a/src/common/package.rb b/src/common/package.rb
index 5be697cd2e21edec6e55577956b24523b5f0a3fc..a7c139f6f22d4f867ee34134b6ded1bac27a266b 100644 (file)
--- a/src/common/package.rb
+++ b/src/common/package.rb
@@ -109,6 +109,6 @@ class Package
        end
 
        def get_changes
-               return "#{@package_name} #{@os_list.join(",")} #{@version}\n#{@change_log[@version]}"
+               return @change_log[@version]
        end
 end

diff --git a/src/pkg_server/distribution.rb b/src/pkg_server/distribution.rb
index 8bd42e274994774e40f4cfe76796cc58214483fa..eddca85e389aa93bbd27bf1c4efdc2eb53a9062e 100644 (file)
--- a/src/pkg_server/distribution.rb
+++ b/src/pkg_server/distribution.rb
@@ -286,7 +286,7 @@ class Distribution
                                end
 
                                @pkg_hash_os[os][pkg.package_name] = pkg
-                               changes.push pkg.get_changes if pkg.does_change_exist?
+                               changes.push "Package: #{pkg.package_name} changes: #{pkg.get_changes}" if pkg.does_change_exist?
                        when "REMOVE"
                                if not force then
                                        if @pkg_hash_os[os][pkg.package_name].origin.eql? "local" then
@@ -328,7 +328,7 @@ class Distribution
                Utils.file_unlock(lock_file)
 
                if not changes.empty? then
-                       @last_sync_changes = "SYSTEM: sync parents server \n#{changes.join("\n")}"
+                       @last_sync_changes = "SYSTEM: sync parents server \n#{changes.uniq.join("\n\n")}"
                end
 
                return distribution_update_flag

diff --git a/src/pkg_server/packageServer.rb b/src/pkg_server/packageServer.rb
index 80910fa7038cd7d20972b6edee5c8bb5b233b24f..03da05862ec5ca37e1ee4fa21e438761c328a856 100644 (file)
--- a/src/pkg_server/packageServer.rb
+++ b/src/pkg_server/packageServer.rb
@@ -259,11 +259,21 @@ class PackageServer
        end
 
        def get_changelog_string( package_list )
-               log_list = []
+               log_list = {}
                package_list.each do |pkg|
-                       if pkg.does_change_exist? then log_list.push pkg.get_changes end
+                       if not pkg.does_change_exist? then next end
+                       set = false
+                       if log_list[[pkg.package_name, pkg.version, pkg.get_changes]].nil? then
+                               log_list[[pkg.package_name, pkg.version, pkg.get_changes]] = pkg.os_list
+                       else
+                               log_list[[pkg.package_name, pkg.version, pkg.get_changes]] = log_list[[pkg.package_name, pkg.version, pkg.get_changes]] + pkg.os_list
+                       end
+               end
+               str=""
+               log_list.each do |key, os_list|
+                       str = str + "Pacakge: #{key[0]}\nOS: #{os_list.join(", ")}\nVersion: #{key[1]}\nChanges: \n#{key[2].sub(/^==/,'Uploader:')}\n\n"
                end
-               return log_list.uniq.join("\n")
+               return str
        end
 
        def generate_snapshot( snpashot_name, dist_name, base_snapshot )