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

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

commit:     11f9903822c653ebfdcea7dd0f2b893c7b7cba7e
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 00:15:02 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri May 25 00:15:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=11f99038

Update host job code

---
 gobs/pym/sync.py     |   16 ++++++++++------
 gobs/pym/updatedb.py |   15 ++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py
index 5f8f2d1..0beeb22 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py
@@ -37,15 +37,19 @@ def sync_tree():
 	tmpcmdline.append("--quiet")
 	tmpcmdline.append("--config-root=" + default_config_root)
 	logging.info("Emerge --sync")
-	fail_sync = False
-	#fail_sync = emerge_main(args=tmpcmdline)
+	fail_sync = emerge_main(args=tmpcmdline)
 	if fail_sync is True:
 		logging.warning("Emerge --sync fail!")
 		return False
 	else:
-		os.mkdir(mysettings['PORTDIR'] + "/profiles/config", 0o777)
-		with open(mysettings['PORTDIR'] + "/profiles/config/parent", "w") as f:
-			f.write("../base\n")
-			f.close()
+		# Need to add a config dir so we can use profiles/base for reading the tree.
+		# We may allready have the dir on local repo when we sync.
+		try:
+			os.mkdir(mysettings['PORTDIR'] + "/profiles/config", 0o777)
+			with open(mysettings['PORTDIR'] + "/profiles/config/parent", "w") as f:
+				f.write("../base\n")
+				f.close()
+		except:
+			pass
 		logging.info("Emerge --sync ... Done.")
 	return True

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py
index 2e369b3..91cb79f 100755
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py
@@ -77,7 +77,7 @@ def update_cpv_db_pool(mysettings, package_line):
 	init_categories.update_categories_db(categories)
 	CM.putConnection(conn)
 			
-def update_cpv_db(mysettings):
+def update_cpv_db():
 	"""Code to update the cpv in the database.
 	@type:settings
 	@parms: portage.settings
@@ -86,6 +86,7 @@ def update_cpv_db(mysettings):
 	@type: dict
 	@parms: config options from the config file
 	"""
+	mysettings =  init_portage_settings()
 	logging.info("Checking categories, package, ebuilds")
 	# Setup portdb, gobs_categories, gobs_old_cpv, package
 	myportdb = portage.portdbapi(mysettings=mysettings)
@@ -103,12 +104,12 @@ def update_cpv_db(mysettings):
 	# Run the update package for all package in the list in
 	# a multiprocessing pool
 	for package_line in sorted(package_list_tree):
-		update_cpv_db_pool(mysettings, package_line)
+		#update_cpv_db_pool(mysettings, package_line)
 		# FIXME: Mem prob with the multiprocessing
-		# pool.apply_async(update_cpv_db_pool, (mysettings, package_line,))
-	# pool.close()
-	# pool.join() 
-	logging.info("Checking categories, package and ebuilds done")
+		pool.apply_async(update_cpv_db_pool, (mysettings, package_line,))
+	pool.close()
+	pool.join() 
+	logging.info("Checking categories, package and ebuilds ... done")
 
 def update_db_main():
 	# Main
@@ -128,6 +129,6 @@ def update_db_main():
 	init_arch = gobs_arch()
 	init_arch.update_arch_db()
 	# Update the cpv db
-	update_cpv_db(mysettings)
+	update_cpv_db()
 	logging.info("Update db ... Done.")
 	return True
\ No newline at end of file