[gentoo-commits] dev/zorry:master commit in: gobs/pym/

[Magnus Granberg]

commit:     d0d469c1afdab7795b97dccf02272bd6fc997611
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 21:32:12 2011 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 21:32:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=d0d469c1

fix bugs in gobs_setup_profile

---
 gobs/pym/init_setup_profile.py |   47 +++++++++++++++++++++++-----------------
 gobs/pym/package.py            |   33 ++++++++++++---------------
 gobs/pym/pgsql.py              |   17 ++++++++------
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/init_setup_profile.py
index cc799cb..e647e1f 100644
--- a/gobs/pym/init_setup_profile.py
+++ b/gobs/pym/init_setup_profile.py
@@ -48,32 +48,39 @@ def setup_profile_main(args=None):
 			config_id_list = []
 			config_id_list.append(config_id)
 			for package_line in sorted(package_list_tree):
-				build_dict = {}
-				packageDict = {}
-				ebuild_id_list = []
-				# split the cp to categories and package
-				element = package_line.split('/')
-				categories = element[0]
-				package = element[1]
-				print "C", categories + "/" + package			# C = Checking
-				pkgdir = mysettings['PORTDIR'] + "/" + categories + "/" + package
-				config_cpv_listDict = init_package.config_match_ebuild(categories, package, config_id_list)
-				if config_cpv_listDict != {}:
-					packageDict['ebuild_version_tree'] = config_cpv_listDict['ebuild_version']
-					build_dict['checksum'] = portage.checksum.sha256hash(pkgdir + "/" + package + "-" + config_cpv_listDict['ebuild_version'] + ".ebuild")[0]
-					build_dict['package_id'] = have_package_db(categories, package)
-					build_dict['ebuild_version'] = config_cpv_listDict['ebuild_version']
-					ebuild_id = get_ebuild_id_db_checksum(connection, build_dict)
-					if ebuild_id is not None:
-						ebuild_id_list.append(ebuild_id)
-						init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict)
+				# FIXME: remove the check for gobs when in tree
+				if package_line != "dev-python/gobs":
+					build_dict = {}
+					packageDict = {}
+					ebuild_id_list = []
+					# split the cp to categories and package
+					element = package_line.split('/')
+					categories = element[0]
+					package = element[1]
+					print "C", categories + "/" + package			# C = Checking
+					pkgdir = mysettings['PORTDIR'] + "/" + categories + "/" + package
+					config_cpv_listDict = init_package.config_match_ebuild(categories, package, config_id_list)
+					if config_cpv_listDict != {}:
+						cpv = categories + "/" + package + "-" + config_cpv_listDict[config_id]['ebuild_version']
+                                                attDict = {}
+                                                attDict['categories'] = categories
+                                                attDict['package'] = package
+                                                attDict['ebuild_version_tree'] = config_cpv_listDict[config_id]['ebuild_version']
+                                                packageDict[cpv] = attDict
+						build_dict['checksum'] = portage.checksum.sha256hash(pkgdir + "/" + package + "-" + config_cpv_listDict[config_id]['ebuild_version'] + ".ebuild")[0]
+						build_dict['package_id'] = have_package_db(conn, categories, package)[0]
+						build_dict['ebuild_version'] = config_cpv_listDict[config_id]['ebuild_version']
+						ebuild_id = get_ebuild_id_db_checksum(conn, build_dict)
+						if ebuild_id is not None:
+							ebuild_id_list.append(ebuild_id)
+							init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict)
 
 		if args[0] == "-del":
 			config_id = args[1]
 			querue_id_list = get_queue_id_list_config(conn, config_id)
 			if querue_id_list is not None:
 				for querue_id in querue_id_list:
-					del_old_queue(conn, queue_id)
+					del_old_queue(conn, querue_id)
 	CM.putConnection(conn)
 
 		
\ No newline at end of file

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index b68d8f6..4f1f48f 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -28,15 +28,12 @@ class gobs_package(object):
 		mysettings_setup = portage.config(config_root = my_new_setup)
 		return mysettings_setup
 
-	def config_match_ebuild(self, categories, package, config_list_all):
-		conn=CM.getConnection()
+	def config_match_ebuild(self, categories, package, config_list):
 		config_cpv_listDict ={}
-		# Get a list from table configs/setups with default_config=Fales and active = True
-		config_list_all  = get_config_list(conn)
-		if config_list_all is ():
+		if config_list == []:
 			return config_cpv_listDict
-		for i in config_list_all:
-			config_id = i[0]
+		conn=CM.getConnection()
+		for config_id in config_list:
 			# Change config/setup
 			mysettings_setup = self.change_config(config_id)
 			myportdb_setup = portage.portdbapi(mysettings=mysettings_setup)
@@ -54,13 +51,13 @@ class gobs_package(object):
 				for iuse_line in iuse_flags_list:
 					iuse_flags_list2.append( init_useflags.reduce_flag(iuse_line))
 					# Dic the needed info
-					attDict = {}
-					attDict['ebuild_version'] = latest_ebuild_version
-					attDict['useflags'] = final_use_list
-					attDict['iuse'] = iuse_flags_list2
-					attDict['package'] = package
-					attDict['categories'] = categories
-					config_cpv_listDict[config_id] = attDict
+				attDict = {}
+				attDict['ebuild_version'] = latest_ebuild_version
+				attDict['useflags'] = final_use_list
+				attDict['iuse'] = iuse_flags_list2
+				attDict['package'] = package
+				attDict['categories'] = categories
+				config_cpv_listDict[config_id] = attDict
 			# Clean some cache
 			myportdb_setup.close_caches()
 			portage.portdbapi.portdbapi_instances.remove(myportdb_setup)
@@ -186,8 +183,8 @@ class gobs_package(object):
 		ebuild_list_tree = self._myportdb.cp_list((categories + "/" + package), use_cache=1, mytree=None)
 		if ebuild_list_tree == []:
 			return None
-		config_list_all  = get_config_list(conn)
-		config_cpv_listDict = self.config_match_ebuild(categories, package, config_list_all)
+		config_list  = get_config_list(conn)
+		config_cpv_listDict = self.config_match_ebuild(categories, package, config_list)
 		config_id  = get_default_config(conn)
 		packageDict ={}
 		for ebuild_line in sorted(ebuild_list_tree):
@@ -237,8 +234,8 @@ class gobs_package(object):
 			package_metadataDict = self.get_package_metadataDict(pkgdir, package)
 			update_new_package_metadata(conn,package_id, package_metadataDict)
 			# Get config_cpv_listDict
-			config_list_all  = get_config_list(conn)
-			config_cpv_listDict = self.config_match_ebuild(categories, package, config_list_all)
+			config_list  = get_config_list(conn)
+			config_cpv_listDict = self.config_match_ebuild(categories, package, config_list)
 			config_id  = get_default_config(conn)
 			packageDict ={}
 			for ebuild_line in sorted(ebuild_list_tree):

diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py
index 1d7ee48..b0a6c83 100644
--- a/gobs/pym/pgsql.py
+++ b/gobs/pym/pgsql.py
@@ -88,7 +88,10 @@ def get_config_list(connection):
   if entries == ():
     return None
   else:
-    return entries
+    config_id_list = []
+    for config_id in entries:
+      config_id_list.append(config_id[0])
+    return config_id_list
 
 def get_config_list_all(connection):
   cursor = connection.cursor()
@@ -284,10 +287,10 @@ def get_ebuild_id_db_checksum(connection, build_dict):
 	cursor = connection.cursor()
 	sqlQ = 'SELECT id FROM ebuilds WHERE ebuild_version = %s AND ebuild_checksum = %s AND package_id = %s'
 	cursor.execute(sqlQ, (build_dict['ebuild_version'], build_dict['checksum'], build_dict['package_id']))
-	ebuild_id = sorted(cursor.fetchall())
-	if ebuild_id is None:
+	ebuild_id_list = sorted(cursor.fetchall())
+	if ebuild_id_list == []:
 		return None
-	return ebuild_id[0]
+	return ebuild_id_list[0]
 
 def get_cpv_from_ebuild_id(connection, ebuild_id):
 	cursor = connection.cursor()
@@ -328,9 +331,9 @@ def have_package_buildqueue(connection, ebuild_id, config_id):
 
 def get_queue_id_list_config(connection, config_id):
 	cursor = connection.cursor()
-	sqlQ = 'SELECT queue_id FROM buildqueue WHERE  config_id = %s'
+	sqlQ = 'SELECT queue_id FROM buildqueue WHERE config = %s'
 	cursor.execute(sqlQ,  (config_id,))
-	entries = cursor.fetchoall()
+	entries = cursor.fetchall()
 	return entries
 
 def add_new_package_buildqueue(connection, ebuild_id, config_id, iuse_flags_list, use_enable, message):
@@ -434,7 +437,7 @@ def del_old_ebuild(connection, ebuild_old_list_db):
 	sqlQ3 = 'DELETE FROM repoman_problems WHERE build_id = %s'
 	sqlQ4 = 'DELETE FROM ebuildbuildwithuses WHERE build_id = %s'
 	sqlQ5 = 'DELETE FROM ebuildhaveskeywords WHERE ebuild_id = %s'
-	sqlQ6 = 'DELETE FROM ebuildhavesiuses WHERE ebuild_id = %s'
+	sqlQ6 = 'DELETE FROM ebuildhavesiuses WHERE ebuild = %s'
 	sqlQ7 = 'DELETE FROM ebuildhavesrestrictions WHERE ebuild_id = %s'
 	sqlQ8 = 'DELETE FROM buildlog WHERE ebuild_id = %s'
 	sqlQ9 = 'SELECT queue_id FROM buildqueue WHERE ebuild_id = %s'