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

[Magnus Granberg]

commit:     9f481d5106bd0925d13cb4e4f61d9238266604ac
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:11:52 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:11:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=9f481d51

some small code fixes

---
 gobs/pym/actions.py        |    2 +-
 gobs/pym/build_depgraph.py |   13 ++++++++-----
 gobs/pym/build_job.py      |    4 ++--
 gobs/pym/build_log.py      |    2 +-
 gobs/pym/buildquerydb.py   |   12 ++++++------
 gobs/pym/package.py        |    4 +++-
 gobs/pym/sync.py           |    2 +-
 gobs/pym/updatedb.py       |    2 +-
 8 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/gobs/pym/actions.py b/gobs/pym/actions.py
index 2b3a6de..3b50187 100644
--- a/gobs/pym/actions.py
+++ b/gobs/pym/actions.py
@@ -306,7 +306,7 @@ def action_build(settings, trees, mtimedb,
 			print(darkgreen("emerge: It seems we have nothing to resume..."))
 			return os.EX_OK
 
-		build_dict, success, settings, trees, mtimedb, mydepgraph = build_mydepgraph(settings,
+		success, settings, trees, mtimedb, mydepgraph = build_mydepgraph(settings,
 			trees, mtimedb, myopts, myparams, myaction, myfiles, spinner, build_dict)
 
 		if not success:

diff --git a/gobs/pym/build_depgraph.py b/gobs/pym/build_depgraph.py
index 86201a4..37b9722 100644
--- a/gobs/pym/build_depgraph.py
+++ b/gobs/pym/build_depgraph.py
@@ -33,12 +33,15 @@ def build_mydepgraph(settings, trees, mtimedb, myopts, myparams, myaction, myfil
 					mydepgraph._display_autounmask()
 					build_dict['type_fail'] = "Need use change"
 					build_dict['check_fail'] = True
-				elif mydepgraph._dynamic_config._unsolvable_blockers:
-					build_dict['type_fail'] = "Blocking packages"
-					build_dict['check_fail'] = True
 				elif mydepgraph._dynamic_config._slot_collision_info:
 					build_dict['type_fail'] = "Slot blocking"
 					build_dict['check_fail'] = True
+				elif mydepgraph._dynamic_config._circular_deps_for_display:
+					build_dict['type_fail'] = "Circular Deps"
+					build_dict['check_fail'] = True
+				elif mydepgraph._dynamic_config._unsolvable_blockers:
+					build_dict['type_fail'] = "Blocking packages"
+					build_dict['check_fail'] = True
 				else:
 					build_dict['type_fail'] = "Dep calc fail"
 					build_dict['check_fail'] = True
@@ -48,7 +51,7 @@ def build_mydepgraph(settings, trees, mtimedb, myopts, myparams, myaction, myfil
 					if not conn2.is_connected() is True:
 						conn2.reconnect(attempts=2, delay=1)
 					log_fail_queru(conn2, build_dict, settings)
-					conn.close
+					conn2.close
 				else:
 					repeat_times = repeat_times + 1
 					settings, trees, mtimedb = load_emerge_config()
@@ -62,4 +65,4 @@ def build_mydepgraph(settings, trees, mtimedb, myopts, myparams, myaction, myfil
 					if success:
 						repeat = False
 
-	return build_dict, success, settings, trees, mtimedb, mydepgraph
+	return success, settings, trees, mtimedb, mydepgraph

diff --git a/gobs/pym/build_job.py b/gobs/pym/build_job.py
index 4d02c8f..6171ef0 100644
--- a/gobs/pym/build_job.py
+++ b/gobs/pym/build_job.py
@@ -52,13 +52,13 @@ class build_job_action(object):
 			else:
 				build_dict['type_fail'] = "Manifest error"
 				build_dict['check_fail'] = True
-				log_msg = "Manifest error: %s:%s" % cpv, manifest_error
+				log_msg = "Manifest error: %s:%s" % (cpv, manifest_error)
 				add_gobs_logs(self._conn, log_msg, "info", self._config_id)
 		else:
 			build_dict['type_fail'] = "Wrong ebuild checksum"
 			build_dict['check_fail'] = True
 		if build_dict['check_fail'] is True:
-				log_fail_queru(conn, build_dict, settings)
+				log_fail_queru(self._conn, build_dict, settings)
 				return None
 		return build_cpv_dict
 

diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py
index 3582406..36f1c7a 100644
--- a/gobs/pym/build_log.py
+++ b/gobs/pym/build_log.py
@@ -217,7 +217,7 @@ def add_buildlog_process(settings, pkg):
 	reader=get_conf_settings()
 	gobs_settings_dict=reader.read_gobs_settings_all()
 	config = gobs_settings_dict['gobs_config']
-	hostname =gobs_settings_dict['gobs_hostname']
+	hostname =gobs_settings_dict['hostname']
 	host_config = hostname + "/" + config
 	config_id = get_config_id(conn, config, hostname)
 	build_dict = get_build_dict_db(conn, config_id, settings, pkg)

diff --git a/gobs/pym/buildquerydb.py b/gobs/pym/buildquerydb.py
index df2dbe0..c7cd49d 100644
--- a/gobs/pym/buildquerydb.py
+++ b/gobs/pym/buildquerydb.py
@@ -36,7 +36,7 @@ def add_cpv_query_pool(mysettings, myportdb, config_id, cp, repo):
 		categories = element[0]
 		package = element[1]
 		log_msg = "C %s:%s" % (cp, repo,)
-		add_gobs_logs(conn, log_msg, "info", config_profile)
+		add_gobs_logs(conn, log_msg, "info", config_id)
 		pkgdir = self._myportdb.getRepositoryPath(repo) + "/" + cp
 		config_id_list = []
 		config_id_list.append(config_id)
@@ -52,7 +52,7 @@ def add_cpv_query_pool(mysettings, myportdb, config_id, cp, repo):
 				ebuild_id_list.append(ebuild_id)
 				init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict)
 		log_msg = "C %s:%s ... Done." % (cp, repo,)
-		add_gobs_logs(conn, log_msg, "info", config_profile)
+		add_gobs_logs(conn, log_msg, "info", config_id)
 	CM.putConnection(conn)
 	return
 
@@ -60,7 +60,7 @@ def add_buildquery_main(config_id):
 	conn=CM.getConnection()
 	config_setup = get_config(conn, config_id)
 	log_msg = "Adding build jobs for: %s" % (config_setup,)
-	add_gobs_logs(conn, log_msg, "info", config_profile)
+	add_gobs_logs(conn, log_msg, "info", config_id)
 	check_make_conf()
 	log_msg = "Check configs done"
 	add_gobs_logs(conn, log_msg, "info", config_profile)
@@ -71,7 +71,7 @@ def add_buildquery_main(config_id):
 	myportdb = portage.portdbapi(mysettings=mysettings)
 	init_package = gobs_package(mysettings, myportdb)
 	log_msg = "Setting default config to: %s" % (config_setup)
-	add_gobs_logs(conn, log_msg, "info", config_profile)
+	add_gobs_logs(conn, log_msg, "info", config_is)
 	# Use all exept 2 cores when multiprocessing
 	pool_cores= multiprocessing.cpu_count()
 	if pool_cores >= 3:
@@ -101,12 +101,12 @@ def del_buildquery_main(config_id):
 	conn=CM.getConnection()
 	config_setup = get_config(conn, config_id)
 	log_msg = "Removeing build jobs for: %s" % (config_setup,)
-	add_gobs_logs(conn, log_msg, "info", config_profile)
+	add_gobs_logs(conn, log_msg, "info", config_id)
 	build_job_id_list = get_build_jobs_id_list_config(conn, config_id)
 	if build_job_id_list is not None:
 		for build_job_id in build_job_id_list:
 			del_old_build_jobs(conn, build_job_id)
 	log_msg = "Removeing build jobs for: %s ... Done." % (config_setup,)
-	add_gobs_logs(conn, log_msg, "info", config_profile)
+	add_gobs_logs(conn, log_msg, "info", config_id)
 	CM.putConnection(conn)
 	return True

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index a86d512..ac70633 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -12,6 +12,8 @@ from gobs.mysql_querys import get_config, get_config_id, add_gobs_logs, get_defa
 from gobs.readconf import get_conf_settings
 reader=get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
+_config = gobs_settings_dict['gobs_config']
+_hostname =gobs_settings_dict['hostname']
 
 class gobs_package(object):
 
@@ -19,7 +21,7 @@ class gobs_package(object):
 		self._conn = conn
 		self._mysettings = mysettings
 		self._myportdb = myportdb
-		self._config_id = get_config_id(conn, config_profile)
+		self._config_id = get_config_id(conn, _config, _hostname)
 
 	def change_config(self, host_config):
 		# Change config_root  config_setup = table config

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py
index 3e25878..4a24484 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py
@@ -13,7 +13,7 @@ from gobs.mysql_querys import get_config_id, add_gobs_logs, get_default_config
 reader=get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
 _config = gobs_settings_dict['gobs_config']
-_hostname =gobs_settings_dict['gobs_hostname']
+_hostname =gobs_settings_dict['hostname']
 
 def git_pull(conn):
 	#FIXME: Use git direct so we can use python 3.*

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py
index cc5681c..56d0894 100644
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py
@@ -18,7 +18,7 @@ from gobs.readconf import get_conf_settings
 reader = get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
 _config = gobs_settings_dict['gobs_config']
-_hostname =gobs_settings_dict['gobs_hostname']
+_hostname =gobs_settings_dict['hostname']
 
 def init_portage_settings(conn, config_id):
 	# check config setup