| 1 |
commit: 132b5560d4981aea3cb4fe25aa29207278e44f5d |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 23:43:25 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 23:43:25 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=132b5560 |
| 7 |
|
| 8 |
fix bug in check_make_conf_guest |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/pym/build_queru.py | 10 +++++----- |
| 12 |
gobs/pym/check_setup.py | 4 ++-- |
| 13 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py |
| 16 |
index 7f5e3c1..65743ad 100644 |
| 17 |
--- a/gobs/pym/build_queru.py |
| 18 |
+++ b/gobs/pym/build_queru.py |
| 19 |
@@ -613,17 +613,17 @@ class queruaction(object): |
| 20 |
|
| 21 |
def make_build_list(self, build_dict): |
| 22 |
cpv = build_dict['category']+'/'+build_dict['package']+'-'+build_dict['ebuild_version'] |
| 23 |
- pkgdir = os.path.join(self._mysettings['PORTDIR'], build_dict['category'] + "/" + build_dict['package']) |
| 24 |
- init_manifest = gobs_manifest(self._mysettings, pkgdir) |
| 25 |
+ pkgdir = os.path.join(portage.settings['PORTDIR'], build_dict['category'] + "/" + build_dict['package']) |
| 26 |
+ init_manifest = gobs_manifest(portage.settings, pkgdir) |
| 27 |
try: |
| 28 |
ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + build_dict['package'] + "-" + build_dict['ebuild_version'] + ".ebuild")[0] |
| 29 |
except: |
| 30 |
ebuild_version_checksum_tree = None |
| 31 |
if ebuild_version_checksum_tree == build_dict['checksum']: |
| 32 |
- init_flags = gobs_use_flags(self._mysettings, self._myportdb, cpv) |
| 33 |
+ init_flags = gobs_use_flags(portage.settings, portage.portdb, cpv) |
| 34 |
build_use_flags_list = init_flags.comper_useflags(build_dict) |
| 35 |
print("build_use_flags_list", build_use_flags_list) |
| 36 |
- manifest_error = init_manifest.check_file_in_manifest(self._myportdb, cpv, build_dict, build_use_flags_list) |
| 37 |
+ manifest_error = init_manifest.check_file_in_manifest(portage.portdb, cpv, build_dict, build_use_flags_list) |
| 38 |
if manifest_error is None: |
| 39 |
build_dict['check_fail'] = False |
| 40 |
build_use_flags_dict = {} |
| 41 |
@@ -646,7 +646,7 @@ class queruaction(object): |
| 42 |
|
| 43 |
def build_procces(self, buildqueru_cpv_dict, build_dict): |
| 44 |
build_cpv_list = [] |
| 45 |
- abs_user_config = os.path.join(self._mysettings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) |
| 46 |
+ abs_user_config = os.path.join(portage.settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) |
| 47 |
print('abs_user_config', abs_user_config) |
| 48 |
for k, v in buildqueru_cpv_dict.iteritems(): |
| 49 |
build_use_flags_list = [] |
| 50 |
|
| 51 |
diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py |
| 52 |
index 6b52f29..58948ec 100644 |
| 53 |
--- a/gobs/pym/check_setup.py |
| 54 |
+++ b/gobs/pym/check_setup.py |
| 55 |
@@ -72,8 +72,8 @@ def check_make_conf_guest(config_profile): |
| 56 |
open_make_conf = open(make_conf_file) |
| 57 |
open_make_conf.close() |
| 58 |
portage.util.getconfig(make_conf_file, tolerant=0, allow_sourcing=False, expand=True) |
| 59 |
- portage.config() |
| 60 |
- portage.settings.validate() |
| 61 |
+ mysettings = portage.config(config_root = "/") |
| 62 |
+ mysettings.validate() |
| 63 |
# With errors we return false |
| 64 |
except Exception as e: |
| 65 |
return "3" |
Archives