1 |
commit: ac1c0c0ab281c910245461649715558d8ad277fc |
2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 23:00:05 2011 +0000 |
4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 23:00:05 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=ac1c0c0a |
7 |
|
8 |
fix a bug for the configs/setups test |
9 |
|
10 |
--- |
11 |
gobs/bin/gobs_updatedb | 2 +- |
12 |
gobs/pym/check_setup.py | 2 +- |
13 |
2 files changed, 2 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/gobs/bin/gobs_updatedb b/gobs/bin/gobs_updatedb |
16 |
index f140e5f..794cb78 100755 |
17 |
--- a/gobs/bin/gobs_updatedb |
18 |
+++ b/gobs/bin/gobs_updatedb |
19 |
@@ -48,7 +48,7 @@ def init_portage_settings(): |
20 |
print master.log() |
21 |
|
22 |
conn=CM.getConnection() |
23 |
- check_make_conf |
24 |
+ check_make_conf(conn) |
25 |
print "Check configs done" |
26 |
# Get default config from the configs table and default_config=1 |
27 |
config_id = get_default_config(conn) # HostConfigDir = table configs id |
28 |
|
29 |
diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py |
30 |
index e3a9075..c90a10b 100644 |
31 |
--- a/gobs/pym/check_setup.py |
32 |
+++ b/gobs/pym/check_setup.py |
33 |
@@ -23,7 +23,7 @@ def check_make_conf(conn): |
34 |
for config_id in config_list_all: |
35 |
attDict={} |
36 |
# Set the config dir |
37 |
- check_config_dir = "/var/lib/gobs/" + gobs_settings_dict['gobs_gitreponame'] + config_id[0] + "/" |
38 |
+ check_config_dir = "/var/lib/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_id[0] + "/" |
39 |
make_conf_file = check_config_dir + "etc/portage/make.conf" |
40 |
# Check if we can open the file and close it |
41 |
# Check if we have some error in the file (portage.util.getconfig) |