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

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

commit:     b76f0d127571cc4a43a6ebe7b93e0ead2c356bcc
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 23:57:54 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 23:57:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=b76f0d12

fix check_make_conf

---
 gobs/pym/check_setup.py  |   15 ++++++++-------
 gobs/pym/pgsql_querys.py |   11 +++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py
index 4d62909..b1a185c 100644
--- a/gobs/pym/check_setup.py
+++ b/gobs/pym/check_setup.py
@@ -19,14 +19,15 @@ if CM.getName()=='pgsql':
 def check_make_conf():
   # Get the config list
   conn=CM.getConnection()
-  config_list_all = get_config_list_all(conn)
+  config_id_list_all = get_config_list_all(conn)
   log_msg = "Checking configs for changes and errors"
   add_gobs_logs(conn, log_msg, "info", config_profile)
   configsDict = {}
-  for config_id in config_list_all:
+  for config_id in config_id_list_all:
 	  attDict={}
 	  # Set the config dir
-	  check_config_dir = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_id[0] + "/"
+	  config = get_config(conn, config_id):
+	  check_config_dir = "/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config + "/"
 	  make_conf_file = check_config_dir + "etc/portage/make.conf"
 	  # Check if we can open the file and close it
 	  # Check if we have some error in the file (portage.util.getconfig)
@@ -41,20 +42,20 @@ def check_make_conf():
 	  except Exception as e:
 		  attDict['config_error'] = e
 		  attDict['active'] = 'False'
-		  log_msg = "%s FAIL!" % (config_id[0],)
+		  log_msg = "%s FAIL!" % (config,)
 		  add_gobs_logs(conn, log_msg, "info", config_profile)
 	  else:
 		  attDict['config_error'] = ''
 		  attDict['active'] = 'True'
-		  log_msg = "%s PASS" % (config_id[0],)
+		  log_msg = "%s PASS" % (config,)
 		  add_gobs_logs(conn, log_msg, "info", config_profile)
 	  # Get the checksum of make.conf
 	  make_conf_checksum_tree = portage.checksum.sha256hash(make_conf_file)[0]
-	  log_msg = "make.conf checksum is %s on %s" % (make_conf_checksum_tree, config_id[0],)
+	  log_msg = "make.conf checksum is %s on %s" % (make_conf_checksum_tree, config,)
 	  add_gobs_logs(conn, log_msg, "info", config_profile)
 	  attDict['make_conf_text'] = get_file_text(make_conf_file)
 	  attDict['make_conf_checksum_tree'] = make_conf_checksum_tree
-	  configsDict[config_id[0]]=attDict
+	  configsDict[config_id]=attDict
   update_make_conf(conn, configsDict)
   log_msg = "Checking configs for changes and errors ... Done"
   add_gobs_logs(conn, log_msg, "info", config_profile)

diff --git a/gobs/pym/pgsql_querys.py b/gobs/pym/pgsql_querys.py
index b74d18c..3c0813d 100644
--- a/gobs/pym/pgsql_querys.py
+++ b/gobs/pym/pgsql_querys.py
@@ -37,14 +37,21 @@ def update_job_list(connection, status, job_id):
 # Queryes to handel the configs* tables
 def get_config_list_all(connection):
 	cursor = connection.cursor()
-	sqlQ = 'SELECT config FROM configs'
+	sqlQ = 'SELECT config_id FROM configs'
 	cursor.execute(sqlQ)
 	entries = cursor.fetchall()
 	return entries
 
+def get_config(connection, config_id):
+	cursor = connection.cursor()
+	sqlQ ='SELECT config FROM configs WHERE config_id = %s'
+	cursor.execute(sqlQ, (config_id,))
+	config = cursor.fetchone()
+	return config[0]
+
 def update_make_conf(connection, configsDict):
 	cursor = connection.cursor()
-	sqlQ = 'UPDATE configs_metadata SET checksum = %s, make_conf_text = %s, active = %s, config_error = %s WHERE config_id = (SELECT config_id FROM configs WHERE config = %s)'
+	sqlQ = 'UPDATE configs_metadata SET checksum = %s, make_conf_text = %s, active = %s, config_error = %s WHERE config_id = %s'
 	for k, v in configsDict.iteritems():
 		cursor.execute(sqlQ, (v['make_conf_checksum_tree'], v['make_conf_text'], v['active'], v['config_error'], k,))
 	connection.commit()