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

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

commit:     9b74adb00bc3678302f5d413aec2fae0ccef1110
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 00:09:53 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 00:09:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=9b74adb0

fix for depgraph

---
 gobs/pym/package.py  |    6 ++----
 gobs/pym/updatedb.py |   11 ++++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index 2fa2039..771572f 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -33,7 +33,6 @@ class gobs_package(object):
 		config_cpv_listDict ={}
 		if config_list == []:
 			return config_cpv_listDict
-		conn=CM.getConnection()
 		for config_id in config_list:
 			# Change config/setup
 			mysettings_setup = self.change_config(config_id)
@@ -62,7 +61,6 @@ class gobs_package(object):
 			# Clean some cache
 			myportdb_setup.close_caches()
 			portage.portdbapi.portdbapi_instances.remove(myportdb_setup)
-		CM.putConnection(conn)
 		return config_cpv_listDict
 
 	def get_ebuild_metadata(self, ebuild_line):
@@ -235,9 +233,9 @@ class gobs_package(object):
 			else:
 				get_manifest_text = get_file_text(pkgdir + "/Manifest")
 			add_new_manifest_sql(conn,package_id, get_manifest_text, manifest_checksum_tree)
-		CM.putConnection(conn)
 		log_msg = "C %s/%s ... Done." % (categories, package)
 		add_gobs_logs(conn, log_msg, "info", config_profile)
+		CM.putConnection(conn)
 
 	def update_package_db(self, categories, package, package_id):
 		conn=CM.getConnection()
@@ -324,9 +322,9 @@ class gobs_package(object):
 			# Mark or remove any old ebuilds
 			init_old_cpv = gobs_old_cpv(self._myportdb, self._mysettings)
 			init_old_cpv.mark_old_ebuild_db(categories, package, package_id)
-		CM.putConnection(conn)
 		log_msg = "C %s/%s ... Done." % (categories, package)
 		add_gobs_logs(conn, log_msg, "info", config_profile)
+		CM.putConnection(conn)
 
 	def update_ebuild_db(self, build_dict):
 		conn=CM.getConnection()

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py
index 8254a3e..e643fc8 100755
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py
@@ -59,9 +59,10 @@ def update_cpv_db_pool(mysettings, myportdb, init_package, package_line):
 	# split the cp to categories and package
 	element = package_line.split('/')
 	categories = element[0]
-	package = element[1]    
+	package = element[1]
 	# Check if we don't have the cp in the package table
 	package_id = have_package_db(conn,categories, package)
+	CM.putConnection(conn)
 	if package_id is None:  
 		# Add new package with ebuilds
 		init_package.add_new_package_db(categories, package)
@@ -72,9 +73,7 @@ def update_cpv_db_pool(mysettings, myportdb, init_package, package_line):
 	# Update the metadata for categories
 	init_categories = gobs_categories(mysettings)
 	init_categories.update_categories_db(categories)
-	myportdb.close_caches()
-	CM.putConnection(conn)
-			
+
 def update_cpv_db():
 	"""Code to update the cpv in the database.
 	@type:settings
@@ -88,6 +87,7 @@ def update_cpv_db():
 	mysettings =  init_portage_settings()
 	log_msg = "Checking categories, package, ebuilds"
 	add_gobs_logs(conn, log_msg, "info", config_profile)
+	CM.putConnection(conn)
 	# Setup portdb, package
 	myportdb = portage.portdbapi(mysettings=mysettings)
 	init_package = gobs_package(mysettings, myportdb)
@@ -108,7 +108,8 @@ def update_cpv_db():
 		#update_cpv_db_pool(mysettings, package_line)
 		pool.apply_async(update_cpv_db_pool, (mysettings, myportdb, init_package, package_line,))
 	pool.close()
-	pool.join() 
+	pool.join()
+	conn=CM.getConnection()
 	log_msg = "Checking categories, package and ebuilds ... done"
 	add_gobs_logs(conn, log_msg, "info", config_profile)
 	CM.putConnection(conn)