[Title] build server second add-sync is fail

[Type] Bugfix
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ia8ac09e0009bd398d9a716c6043fe41dc2eb6ee8

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 814b2be71dbe40e990b1f26e2537b0614e69e63a..7328abef71c57ab0baf57bbfea502a0c03e9bb7c 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -354,7 +354,7 @@ class BuildServer
        # add new remote pkg server
        def add_sync_package_server( url, dist )
                get_db_connection() do |db|
-                       row = db.select_one("SELECT distributions.id FROM sync_pkg_servers,distributions WHERE sync_pkg_servers.pkgsvr_url='#{url}' and distributions.name='#{dist}'")
+                       row = db.select_one("SELECT distributions.id FROM sync_pkg_servers,distributions WHERE sync_pkg_servers.pkgsvr_url='#{url}' and distributions.name='#{dist}' and sync_pkg_servers.distribution_id = distributions.id")
                        if not row.nil? then return false end
                        row = db.select_one("SELECT id FROM distributions WHERE name='#{dist}'")
                        dist_id = row['id'];
@@ -368,7 +368,7 @@ class BuildServer
        # remove remote pkg server
        def remove_sync_package_server( url, dist )
                get_db_connection() do |db|
-                       row = db.select_one("SELECT distributions.id FROM sync_pkg_servers,distributions WHERE sync_pkg_servers.pkgsvr_url='#{url}' and distributions.name='#{dist}'")
+                       row = db.select_one("SELECT distributions.id FROM sync_pkg_servers,distributions WHERE sync_pkg_servers.pkgsvr_url='#{url}' and distributions.name='#{dist}' and sync_pkg_servers.distribution_id = distributions.id")
                        if row.nil? then return false end
                        dist_id = row['id'];
                        db.do("DELETE FROM sync_pkg_servers WHERE pkgsvr_url='#{url}' and distribution_id=#{dist_id}")