Revert "Merge branch 'staging' into develop"

This reverts commit 3e6fcc62d9b5a26a101070ed813bf02f290778bb

diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index 25e42babf046060142791bb59d58cd0af7e748cd..7c639b51d6fe006bf0d4d074977650e2b3fbc320 100644 (file)
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -203,8 +203,10 @@ class CommonProject
 
        protected
        def self.load_row(name, dist_name, db)
-               row = db.select_one("SELECT projects.* FROM projects,distributions WHERE projects.name='#{name}' and 
-                                                       projects.distribution_id=distribuitons.id and distributions.name='#{dist_name}'")
+               row = db.select_one("SELECT * FROM distributions WHERE name='#{dist_name}'")
+               if row.nil? then return nil end
+               dist_id = row['id']
+               row = db.select_one("SELECT * FROM projects WHERE name='#{name}' and distribution_id=#{dist_id}")
                if row.nil? then return nil end
 
                # get supported_os
@@ -334,7 +336,10 @@ class CommonProject
 
        public
        def self.get_project_row(name, dist_name, db)
-               return db.select_one("SELECT * FROM projects WHERE name='#{name}' AND distribution_id=(SELECT id FROM distributions WHERE name='#{dist_name}')")
+               row = db.select_one("SELECT * FROM distributions WHERE name='#{dist_name}'")
+               dist_id = row['id']
+               row = db.select_one("SELECT * FROM projects WHERE name='#{name}' and distribution_id=#{dist_id}")
+               return row
        end
 
        public