1 |
commit: 428bc9ec876dc40f2d50efb7ec4fee1d04390342 |
2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 21:26:20 2011 +0000 |
4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 21:26:20 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=428bc9ec |
7 |
|
8 |
fix more CM.putConnection |
9 |
|
10 |
--- |
11 |
gobs/bin/gobs_buildquerys | 4 ---- |
12 |
gobs/doc/Setup.txt | 1 - |
13 |
gobs/pym/build_queru.py | 1 + |
14 |
3 files changed, 1 insertions(+), 5 deletions(-) |
15 |
|
16 |
diff --git a/gobs/bin/gobs_buildquerys b/gobs/bin/gobs_buildquerys |
17 |
index c2e1923..e109efc 100755 |
18 |
--- a/gobs/bin/gobs_buildquerys |
19 |
+++ b/gobs/bin/gobs_buildquerys |
20 |
@@ -6,10 +6,6 @@ reader=get_conf_settings() |
21 |
gobs_settings_dict=reader.read_gobs_settings_all() |
22 |
# make a CM |
23 |
from gobs.ConnectionManager import connectionManager |
24 |
-CM=connectionManager(gobs_settings_dict) |
25 |
-#selectively import the pgsql/mysql querys |
26 |
-if CM.getName()=='pgsql': |
27 |
- from gobs.pgsql import * |
28 |
|
29 |
from gobs.check_setup import check_configure_guest |
30 |
from gobs.build_queru import queruaction |
31 |
|
32 |
diff --git a/gobs/doc/Setup.txt b/gobs/doc/Setup.txt |
33 |
index 956990f..3c01382 100644 |
34 |
--- a/gobs/doc/Setup.txt |
35 |
+++ b/gobs/doc/Setup.txt |
36 |
@@ -3,5 +3,4 @@ Setup the gobs.conf for the db. |
37 |
Change GOBSGITREPONAME to point to the git repo with your configs for the profiles/setups. |
38 |
Import the *dump.sql.gz to your sql. |
39 |
The portage/base/make.conf should be in the base profile/setup |
40 |
-The portage/all/bashrc should be in all the guest profiles/setups |
41 |
The porfiles dir need a dir call config with a parent file that point to base profile |
42 |
|
43 |
diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py |
44 |
index 3f0bde8..200c41d 100644 |
45 |
--- a/gobs/pym/build_queru.py |
46 |
+++ b/gobs/pym/build_queru.py |
47 |
@@ -75,6 +75,7 @@ class queruaction(object): |
48 |
fail_querue_dict['querue_id'] = build_dict['queue_id'] |
49 |
fail_querue_dict['fail_type'] = build_dict['type_fail'] |
50 |
update_fail_times(conn, fail_querue_dict) |
51 |
+ CM.putConnection(conn) |
52 |
return |
53 |
else: |
54 |
build_log_dict = {} |