| 1 |
commit: 12cec5b4dca202068d165cd72f760534a437e888 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 00:32:16 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 00:32:16 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=12cec5b4 |
| 7 |
|
| 8 |
fix def of settings and portdb |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/bin/gobs_buildquerys | 2 +- |
| 12 |
gobs/pym/build_queru.py | 24 +++++++++++++----------- |
| 13 |
2 files changed, 14 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gobs/bin/gobs_buildquerys b/gobs/bin/gobs_buildquerys |
| 16 |
index fc2506d..81c0f26 100755 |
| 17 |
--- a/gobs/bin/gobs_buildquerys |
| 18 |
+++ b/gobs/bin/gobs_buildquerys |
| 19 |
@@ -28,7 +28,7 @@ def main_loop(config_profile): |
| 20 |
continue # retunr to the start of the function |
| 21 |
else: |
| 22 |
init_queru.procces_qureru() |
| 23 |
- sys.exit() |
| 24 |
+ continue # retunr to the start of the function |
| 25 |
|
| 26 |
def main(): |
| 27 |
# Main |
| 28 |
|
| 29 |
diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py |
| 30 |
index 65743ad..e1de617 100644 |
| 31 |
--- a/gobs/pym/build_queru.py |
| 32 |
+++ b/gobs/pym/build_queru.py |
| 33 |
@@ -53,7 +53,7 @@ bad = create_color_func("BAD") |
| 34 |
class queruaction(object): |
| 35 |
|
| 36 |
def __init__(self, config_profile): |
| 37 |
- self._mysettings = portage.settings |
| 38 |
+ self._mysettings = portage.config(config_root = "/") |
| 39 |
self._config_profile = config_profile |
| 40 |
self._myportdb = portage.portdb |
| 41 |
|
| 42 |
@@ -611,19 +611,19 @@ class queruaction(object): |
| 43 |
|
| 44 |
return retval |
| 45 |
|
| 46 |
- def make_build_list(self, build_dict): |
| 47 |
+ def make_build_list(self, build_dict, settings, portdb): |
| 48 |
cpv = build_dict['category']+'/'+build_dict['package']+'-'+build_dict['ebuild_version'] |
| 49 |
- pkgdir = os.path.join(portage.settings['PORTDIR'], build_dict['category'] + "/" + build_dict['package']) |
| 50 |
- init_manifest = gobs_manifest(portage.settings, pkgdir) |
| 51 |
+ pkgdir = os.path.join(settings['PORTDIR'], build_dict['category'] + "/" + build_dict['package']) |
| 52 |
+ init_manifest = gobs_manifest(settings, pkgdir) |
| 53 |
try: |
| 54 |
ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + build_dict['package'] + "-" + build_dict['ebuild_version'] + ".ebuild")[0] |
| 55 |
except: |
| 56 |
ebuild_version_checksum_tree = None |
| 57 |
if ebuild_version_checksum_tree == build_dict['checksum']: |
| 58 |
- init_flags = gobs_use_flags(portage.settings, portage.portdb, cpv) |
| 59 |
+ init_flags = gobs_use_flags(settings, portdb, cpv) |
| 60 |
build_use_flags_list = init_flags.comper_useflags(build_dict) |
| 61 |
print("build_use_flags_list", build_use_flags_list) |
| 62 |
- manifest_error = init_manifest.check_file_in_manifest(portage.portdb, cpv, build_dict, build_use_flags_list) |
| 63 |
+ manifest_error = init_manifest.check_file_in_manifest(portdb, cpv, build_dict, build_use_flags_list) |
| 64 |
if manifest_error is None: |
| 65 |
build_dict['check_fail'] = False |
| 66 |
build_use_flags_dict = {} |
| 67 |
@@ -640,13 +640,13 @@ class queruaction(object): |
| 68 |
build_dict['type_fail'] = "Wrong ebuild checksum" |
| 69 |
build_dict['check_fail'] = True |
| 70 |
if build_dict['check_fail'] is True: |
| 71 |
- self.log_fail_queru(build_dict, portage.settings) |
| 72 |
+ self.log_fail_queru(build_dict, settings) |
| 73 |
return None |
| 74 |
return build_cpv_dict |
| 75 |
|
| 76 |
- def build_procces(self, buildqueru_cpv_dict, build_dict): |
| 77 |
+ def build_procces(self, buildqueru_cpv_dict, build_dict, settings, portdb): |
| 78 |
build_cpv_list = [] |
| 79 |
- abs_user_config = os.path.join(portage.settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) |
| 80 |
+ abs_user_config = os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) |
| 81 |
print('abs_user_config', abs_user_config) |
| 82 |
for k, v in buildqueru_cpv_dict.iteritems(): |
| 83 |
build_use_flags_list = [] |
| 84 |
@@ -689,15 +689,17 @@ class queruaction(object): |
| 85 |
conn=CM.getConnection() |
| 86 |
build_dict = {} |
| 87 |
build_dict = get_packages_to_build(conn, self._config_profile) |
| 88 |
+ settings, trees, mtimedb = load_emerge_config() |
| 89 |
+ portdb = trees[settings["ROOT"]]["porttree"].dbapi |
| 90 |
if build_dict is None: |
| 91 |
return |
| 92 |
print("build_dict", build_dict) |
| 93 |
if not build_dict['ebuild_id'] is None and build_dict['checksum'] is not None: |
| 94 |
- buildqueru_cpv_dict = self.make_build_list(build_dict) |
| 95 |
+ buildqueru_cpv_dict = self.make_build_list(build_dict, settings, portdb) |
| 96 |
print('buildqueru_cpv_dict', buildqueru_cpv_dict) |
| 97 |
if buildqueru_cpv_dict is None: |
| 98 |
return |
| 99 |
- fail_build_procces = self.build_procces(buildqueru_cpv_dict, build_dict) |
| 100 |
+ fail_build_procces = self.build_procces(buildqueru_cpv_dict, build_dict, settings, portdb) |
| 101 |
return |
| 102 |
if not build_dict['post_message'] is [] and build_dict['ebuild_id'] is None: |
| 103 |
return |
Archives