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

["Magnus Granberg" <zorry@gentoo.org>]

commit:     4e044fc62205c73300cd1ab942f7f235f5ea0acc
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 22:23:54 2011 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 22:23:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=4e044fc6

fix bugs in setup_profile

---
 gobs/pym/init_setup_profile.py |   10 ++++++----
 gobs/pym/package.py            |   36 ++++++------------------------------
 gobs/pym/pgsql.py              |    6 +++++-
 3 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/init_setup_profile.py
index 6f640d9..23a2056 100644
--- a/gobs/pym/init_setup_profile.py
+++ b/gobs/pym/init_setup_profile.py
@@ -45,10 +45,12 @@ def setup_profile_main(args=None):
 			# Set config_root (PORTAGE_CONFIGROOT)  to default_config_root
 			mysettings = portage.config(config_root = default_config_root)
 			myportdb = portage.portdbapi(mysettings=mysettings)
-			init_package = gobs_package
+			init_package = gobs_package(mysettings, myportdb)
 			# get the cp list
-			package_list_tree = package_list_tree = myportdb.cp_all()(mysettings, myportdb)
+			package_list_tree = package_list_tree = myportdb.cp_all()
 			print "Setting default config to:", config_id
+			config_id_list = []
+			config_id_list.append(config_id)
 			for package_line in sorted(package_list_tree):
 				build_dict = {}
 				packageDict = {}
@@ -59,7 +61,7 @@ def setup_profile_main(args=None):
 				package = element[1]
 				print "C", categories + "/" + package			# C = Checking
 				pkgdir = mysettings['PORTDIR'] + "/" + categories + "/" + package
-				config_cpv_listDict = gobs_package.config_match_cp(categories, package, config_id)
+				config_cpv_listDict = init_package.config_match_cp(categories, package, config_id_list)
 				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)
@@ -67,7 +69,7 @@ def setup_profile_main(args=None):
 				ebuild_id = get_ebuild_id_db_checksum(connection, build_dict)
 				if ebuild_id is not None:
 					ebuild_id_list.append(ebuild_id)
-					gobs_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict)
+					init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict)
 		if args[0] is "-del":
 			config_id = args[1]
 			querue_id_list = get_queue_id_list_config(conn, config_id)

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index bbd5998..3bd614e 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -28,7 +28,7 @@ class gobs_package(object):
 		mysettings_setup = portage.config(config_root = my_new_setup)
 		return mysettings_setup
 
-	def config_match_ebuild(self, categories, package):
+	def config_match_ebuild(self, categories, package, config_list_all):
 		conn=CM.getConnection()
 		config_cpv_listDict ={}
 		# Get a list from table configs/setups with default_config=Fales and active = True
@@ -67,32 +67,6 @@ class gobs_package(object):
 		CM.putConnection(conn)
 		return config_cpv_listDict
 
-	def config_match_cp(self, categories, package, config_id):
-		config_cpv_listDict ={}
-		# Get latest cpv from portage with the config
-		latest_ebuild = self._myportdb_setup.xmatch('bestmatch-visible', categories + "/" + package)
-		latest_ebuild_version = unicode("")
-		# Check if could get cpv from portage
-		if latest_ebuild != "":
-			# Get the version of cpv
-			latest_ebuild_version = portage.versions.cpv_getversion(latest_ebuild)
-			# Get the iuse and use flags for that config/setup
-			init_useflags = gobs_use_flags(self._mysettings, self._myportdb, latest_ebuild)
-			iuse_flags_list, final_use_list = init_useflags.get_flags()
-			iuse_flags_list2 = []
-			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
-		# Clean some cache
-		return config_cpv_listDict
-
 	def get_ebuild_metadata(self, ebuild_line):
 		# Get the auxdbkeys infos for the ebuild
 		try:
@@ -156,7 +130,7 @@ class gobs_package(object):
 		conn=CM.getConnection()
 		# Get the needed info from packageDict and config_cpv_listDict and put that in buildqueue
 		# Only add it if ebuild_version in packageDict and config_cpv_listDict match
-		if config_cpv_listDict != {}:
+		if config_cpv_listDict not None:
 			message = None
 			# Unpack config_cpv_listDict
 			for k, v in config_cpv_listDict.iteritems():
@@ -212,7 +186,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_cpv_listDict = self.config_match_ebuild(categories, package)
+		config_list_all  = get_config_list(conn)
+		config_cpv_listDict = self.config_match_ebuild(categories, package, config_list_all)
 		config_id  = get_default_config(conn)
 		packageDict ={}
 		for ebuild_line in sorted(ebuild_list_tree):
@@ -262,7 +237,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_cpv_listDict = self.config_match_ebuild(categories, package)
+			config_list_all  = get_config_list(conn)
+			config_cpv_listDict = self.config_match_ebuild(categories, package, config_list_all)
 			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 606c624..1d7ee48 100644
--- a/gobs/pym/pgsql.py
+++ b/gobs/pym/pgsql.py
@@ -84,7 +84,11 @@ def get_config_list(connection):
   cursor = connection.cursor()
   sqlQ = 'SELECT id FROM configs WHERE default_config = False AND active = True'
   cursor.execute(sqlQ)
-  return cursor.fetchall()
+  entries = cursor.fetchall()
+  if entries == ():
+    return None
+  else:
+    return entries
 
 def get_config_list_all(connection):
   cursor = connection.cursor()