| 1 |
commit: 498ad87c8ce8758c1da7c54b84f12c0fb5697bd8 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 27 23:52:28 2012 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 27 23:52:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=498ad87c |
| 7 |
|
| 8 |
fix some small errors in the code |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/pym/build_depgraph.py | 3 ++- |
| 12 |
gobs/pym/jobs.py | 5 ++--- |
| 13 |
gobs/pym/mysql_querys.py | 2 +- |
| 14 |
gobs/pym/readconf.py | 4 ++-- |
| 15 |
4 files changed, 7 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gobs/pym/build_depgraph.py b/gobs/pym/build_depgraph.py |
| 18 |
index ebff21b..86201a4 100644 |
| 19 |
--- a/gobs/pym/build_depgraph.py |
| 20 |
+++ b/gobs/pym/build_depgraph.py |
| 21 |
@@ -1,5 +1,6 @@ |
| 22 |
from __future__ import print_function |
| 23 |
-from _emerge.depgraph import backtrack_depgraph, create_depgraph_params |
| 24 |
+from _emerge.create_depgraph_params import create_depgraph_params |
| 25 |
+from _emerge.depgraph import backtrack_depgraph |
| 26 |
import portage |
| 27 |
portage.proxy.lazyimport.lazyimport(globals(), |
| 28 |
'gobs.actions:load_emerge_config', |
| 29 |
|
| 30 |
diff --git a/gobs/pym/jobs.py b/gobs/pym/jobs.py |
| 31 |
index 67ced42..bd40175 100644 |
| 32 |
--- a/gobs/pym/jobs.py |
| 33 |
+++ b/gobs/pym/jobs.py |
| 34 |
@@ -6,8 +6,7 @@ from gobs.updatedb import update_db_main |
| 35 |
from gobs.mysql_querys import get_config_id, add_gobs_logs, get_jobs_id, get_job, \ |
| 36 |
update_job_list, get_job_type |
| 37 |
|
| 38 |
-def jobs_main(conn, config_profile): |
| 39 |
- config_id = get_config_id(conn, config_profile) |
| 40 |
+def jobs_main(conn, config_id): |
| 41 |
jobs_id = get_jobs_id(conn, config_id) |
| 42 |
if jobs_id is None: |
| 43 |
return |
| 44 |
@@ -32,7 +31,7 @@ def jobs_main(conn, config_profile): |
| 45 |
elif job == "delbuildquery": |
| 46 |
update_job_list(conn, "Runing", job_id) |
| 47 |
log_msg = "Job %s is runing." % (job_id,) |
| 48 |
- add_gobs_logs(conn, log_msg, "info", config_profile) |
| 49 |
+ add_gobs_logs(conn, log_msg, "info", config_id) |
| 50 |
result = del_buildquery_main(config_id) |
| 51 |
if result is True: |
| 52 |
update_job_list(conn, "Done", job_id) |
| 53 |
|
| 54 |
diff --git a/gobs/pym/mysql_querys.py b/gobs/pym/mysql_querys.py |
| 55 |
index 3d9d495..8665f97 100644 |
| 56 |
--- a/gobs/pym/mysql_querys.py |
| 57 |
+++ b/gobs/pym/mysql_querys.py |
| 58 |
@@ -3,7 +3,7 @@ from __future__ import print_function |
| 59 |
# Queryes to add the logs |
| 60 |
def get_config_id(connection, config, host): |
| 61 |
cursor = connection.cursor() |
| 62 |
- sqlQ = 'SELECT config_id FROM configs WHERE config = %s AND hostname= host' |
| 63 |
+ sqlQ = 'SELECT config_id FROM configs WHERE config = %s AND hostname= %s' |
| 64 |
cursor.execute(sqlQ,(config, host,)) |
| 65 |
entries = cursor.fetchone() |
| 66 |
cursor.close() |
| 67 |
|
| 68 |
diff --git a/gobs/pym/readconf.py b/gobs/pym/readconf.py |
| 69 |
index 45ed10a..d78eda0 100644 |
| 70 |
--- a/gobs/pym/readconf.py |
| 71 |
+++ b/gobs/pym/readconf.py |
| 72 |
@@ -1,7 +1,7 @@ |
| 73 |
import os |
| 74 |
import sys |
| 75 |
import re |
| 76 |
-import socket |
| 77 |
+from socket import getfqdn |
| 78 |
|
| 79 |
class get_conf_settings(object): |
| 80 |
# open the /etc/buildhost/buildhost.conf file and get the needed |
| 81 |
@@ -46,6 +46,6 @@ class get_conf_settings(object): |
| 82 |
gobs_settings_dict['sql_passwd'] = get_sql_passwd.rstrip('\n') |
| 83 |
gobs_settings_dict['gobs_gitreponame'] = get_gobs_gitreponame.rstrip('\n') |
| 84 |
gobs_settings_dict['gobs_config'] = get_gobs_config.rstrip('\n') |
| 85 |
- gobs_settings_dict['hostname'] = socket.gethostname() |
| 86 |
+ gobs_settings_dict['hostname'] = getfqdn() |
| 87 |
# gobs_settings_dict['gobs_logfile'] = get_gobs_logfile.rstrip('\n') |
| 88 |
return gobs_settings_dict |
Archives