| 1 |
commit: 63620a8bb2fab8551c42164bcbc35513c8efff5e |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 1 23:29:32 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 1 23:29:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=63620a8b |
| 7 |
|
| 8 |
Fix errors for python 3.* support |
| 9 |
|
| 10 |
--- |
| 11 |
ebuild/dev-python/gobs/gobs-9999.ebuild | 4 ++-- |
| 12 |
gobs/pym/build_queru.py | 21 +++++++++++---------- |
| 13 |
gobs/pym/check_setup.py | 9 +++++---- |
| 14 |
gobs/pym/pgsql.py | 6 +++--- |
| 15 |
4 files changed, 21 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/ebuild/dev-python/gobs/gobs-9999.ebuild b/ebuild/dev-python/gobs/gobs-9999.ebuild |
| 18 |
index 9ced40d..22fa1b7 100644 |
| 19 |
--- a/ebuild/dev-python/gobs/gobs-9999.ebuild |
| 20 |
+++ b/ebuild/dev-python/gobs/gobs-9999.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
# $Header: $ |
| 23 |
|
| 24 |
EAPI="2" |
| 25 |
-PYTHON_DEPEND="2" |
| 26 |
+PYTHON_DEPEND="*:2.7" |
| 27 |
SUPPORT_PYTHON_ABIS="1" |
| 28 |
|
| 29 |
inherit distutils git-2 |
| 30 |
@@ -23,7 +23,7 @@ RDEPEND="sys-apps/portage |
| 31 |
DEPEND="${RDEPEND} |
| 32 |
dev-python/setuptools" |
| 33 |
|
| 34 |
-RESTRICT_PYTHON_ABIS="3.*" |
| 35 |
+# RESTRICT_PYTHON_ABIS="3.*" |
| 36 |
|
| 37 |
EGIT_REPO_URI="http://git.overlays.gentoo.org/gitroot/dev/zorry.git" |
| 38 |
#EGIT_FETCH_CMD="git clone" |
| 39 |
|
| 40 |
diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py |
| 41 |
index f97884d..0e481da 100644 |
| 42 |
--- a/gobs/pym/build_queru.py |
| 43 |
+++ b/gobs/pym/build_queru.py |
| 44 |
@@ -1,4 +1,5 @@ |
| 45 |
# Get the options from the config file set in gobs.readconf |
| 46 |
+from __future__ import print_function |
| 47 |
from gobs.readconf import get_conf_settings |
| 48 |
reader=get_conf_settings() |
| 49 |
gobs_settings_dict=reader.read_gobs_settings_all() |
| 50 |
@@ -59,8 +60,8 @@ class queruaction(object): |
| 51 |
conn=CM.getConnection() |
| 52 |
cpv = build_dict['category']+'/'+build_dict['package']+'-'+build_dict['ebuild_version'] |
| 53 |
pkgdir = os.path.join(self._mysettings['PORTDIR'], build_dict['category'] + "/" + build_dict['package']) |
| 54 |
- init_manifest = gobs_manifest(self._mysettings, pkgdir) |
| 55 |
- try: |
| 56 |
+ init_manifest = gobs_manifest(self._mysettings, pkgdir) |
| 57 |
+ try: |
| 58 |
ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + build_dict['package'] + "-" + build_dict['ebuild_version'] + ".ebuild")[0] |
| 59 |
except: |
| 60 |
ebuild_version_checksum_tree = None |
| 61 |
@@ -68,12 +69,12 @@ class queruaction(object): |
| 62 |
if portage.getmaskingstatus(cpv, settings=self._mysettings, portdb=self._myportdb) == []: |
| 63 |
init_flags = gobs_use_flags(self._mysettings, self._myportdb, cpv) |
| 64 |
build_use_flags_list = init_flags.comper_useflags(build_dict) |
| 65 |
- print "build_use_flags_list", build_use_flags_list |
| 66 |
+ print("build_use_flags_list", build_use_flags_list) |
| 67 |
manifest_error = init_manifest.check_file_in_manifest(self._myportdb, cpv, build_dict, build_use_flags_list) |
| 68 |
if manifest_error is None: |
| 69 |
build_dict['check_fail'] = False |
| 70 |
build_cpv_dict = init_flags.get_needed_dep_useflags(build_use_flags_list) |
| 71 |
- print build_cpv_dict, build_use_flags_list, cpv |
| 72 |
+ print(build_cpv_dict, build_use_flags_list, cpv) |
| 73 |
build_use_flags_dict = {} |
| 74 |
if build_use_flags_list is None: |
| 75 |
build_use_flags_dict['None'] = None |
| 76 |
@@ -82,7 +83,7 @@ class queruaction(object): |
| 77 |
build_cpv_dict[cpv] = build_use_flags_dict |
| 78 |
else: |
| 79 |
build_cpv_dict[cpv] = build_use_flags_dict |
| 80 |
- print build_cpv_dict |
| 81 |
+ print(build_cpv_dict) |
| 82 |
return build_cpv_dict, build_dict |
| 83 |
else: |
| 84 |
build_dict['1'] = 1 |
| 85 |
@@ -102,7 +103,7 @@ class queruaction(object): |
| 86 |
build_use_flags_list.append(x) |
| 87 |
if y is False: |
| 88 |
build_use_flags_list.append("-" + x) |
| 89 |
- print k, build_use_flags_list |
| 90 |
+ print(k, build_use_flags_list) |
| 91 |
if build_use_flags_list == []: |
| 92 |
build_cpv_list.append("=" + k) |
| 93 |
else: |
| 94 |
@@ -110,7 +111,7 @@ class queruaction(object): |
| 95 |
for flags in build_use_flags_list: |
| 96 |
build_use_flags = build_use_flags + flags + "," |
| 97 |
build_cpv_list.append("=" + k + "[" + build_use_flags + "]") |
| 98 |
- print 'build_cpv_list', build_cpv_list |
| 99 |
+ print('build_cpv_list', build_cpv_list) |
| 100 |
argscmd = [] |
| 101 |
if not "nooneshort" in build_dict['post_message']: |
| 102 |
argscmd.append("--oneshot") |
| 103 |
@@ -118,7 +119,7 @@ class queruaction(object): |
| 104 |
argscmd.append("--usepkg") |
| 105 |
for build_cpv in build_cpv_list: |
| 106 |
argscmd.append(build_cpv) |
| 107 |
- print argscmd |
| 108 |
+ print(argscmd) |
| 109 |
# Call main_emerge to build the package in build_cpv_list |
| 110 |
try: |
| 111 |
build_fail = emerge_main(args=argscmd) |
| 112 |
@@ -135,14 +136,14 @@ class queruaction(object): |
| 113 |
conn=CM.getConnection() |
| 114 |
build_dict = {} |
| 115 |
build_dict = get_packages_to_build(conn, self._config_profile) |
| 116 |
- print "build_dict", build_dict |
| 117 |
+ print("build_dict", build_dict) |
| 118 |
if build_dict is None and fail_querue_dict == {}: |
| 119 |
return fail_querue_dict |
| 120 |
if build_dict is None and fail_querue_dict != {}: |
| 121 |
return fail_querue_dict |
| 122 |
if not build_dict['ebuild_id'] is None and build_dict['checksum'] is not None: |
| 123 |
buildqueru_cpv_dict, build_dict = self.make_build_list(build_dict) |
| 124 |
- print 'buildqueru_cpv_dict', buildqueru_cpv_dict |
| 125 |
+ print('buildqueru_cpv_dict', buildqueru_cpv_dict) |
| 126 |
if buildqueru_cpv_dict is None: |
| 127 |
return fail_querue_dict |
| 128 |
fail_build_procces = self.build_procces(buildqueru_cpv_dict, build_dict) |
| 129 |
|
| 130 |
diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py |
| 131 |
index c90a10b..09823cd 100644 |
| 132 |
--- a/gobs/pym/check_setup.py |
| 133 |
+++ b/gobs/pym/check_setup.py |
| 134 |
@@ -1,3 +1,4 @@ |
| 135 |
+from __future__ import print_function |
| 136 |
import portage |
| 137 |
import os |
| 138 |
import errno |
| 139 |
@@ -18,7 +19,7 @@ def check_make_conf(conn): |
| 140 |
# Get the config list |
| 141 |
##selective import the pgsql/mysql queries |
| 142 |
config_list_all = get_config_list_all(conn) |
| 143 |
- print "Checking configs for changes and errors" |
| 144 |
+ print("Checking configs for changes and errors") |
| 145 |
configsDict = {} |
| 146 |
for config_id in config_list_all: |
| 147 |
attDict={} |
| 148 |
@@ -38,11 +39,11 @@ def check_make_conf(conn): |
| 149 |
except Exception as e: |
| 150 |
attDict['config_error'] = e |
| 151 |
attDict['active'] = 'False' |
| 152 |
- print "Fail", config_id[0] |
| 153 |
+ print("Fail", config_id[0]) |
| 154 |
else: |
| 155 |
attDict['config_error'] = '' |
| 156 |
attDict['active'] = 'True' |
| 157 |
- print "Pass", config_id[0] |
| 158 |
+ print("Pass", config_id[0]) |
| 159 |
# Get the checksum of make.conf |
| 160 |
make_conf_checksum_tree = portage.checksum.sha256hash(make_conf_file)[0] |
| 161 |
# Check if we have change the make.conf and update the db with it |
| 162 |
@@ -50,7 +51,7 @@ def check_make_conf(conn): |
| 163 |
attDict['make_conf_checksum_tree'] = make_conf_checksum_tree |
| 164 |
configsDict[config_id]=attDict |
| 165 |
update__make_conf(conn,configsDict) |
| 166 |
- print "Updated configurtions" |
| 167 |
+ print("Updated configurtions") |
| 168 |
|
| 169 |
def check_make_conf_guest(connection, config_profile): |
| 170 |
make_conf_checksum_db = get_profile_checksum(connection,config_profile)[0] |
| 171 |
|
| 172 |
diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py |
| 173 |
index 021c37f..c66f205 100644 |
| 174 |
--- a/gobs/pym/pgsql.py |
| 175 |
+++ b/gobs/pym/pgsql.py |
| 176 |
@@ -502,9 +502,9 @@ def add_new_buildlog(connection, build_dict, use_flags_list, use_enable_list, bu |
| 177 |
repoman_error_list = build_log_dict['repoman_error_list'] |
| 178 |
qa_error_list = build_log_dict['qa_error_list'] |
| 179 |
if not use_flags_list: |
| 180 |
- use_flags_list=None |
| 181 |
- use_enable=None |
| 182 |
- print('make_deplog', build_dict['ebuild_id'], build_dict['config_profile'], use_flags_list, use_enable_list, summary_error, build_error, build_log_dict['logfilename'], qa_error_list, repoman_error_list) |
| 183 |
+ use_flags_list=None |
| 184 |
+ use_enable=None |
| 185 |
+ print('make_deplog', build_dict['ebuild_id'], build_dict['config_profile'], use_flags_list, use_enable_list, summary_error, build_error, build_log_dict['logfilename'], qa_error_list, repoman_error_list) |
| 186 |
sqlQ = 'SELECT make_deplog( %s, %s, %s, %s, %s, %s, %s, %s, %s)' |
| 187 |
params = (build_dict['ebuild_id'], build_dict['config_profile'], use_flags_list, use_enable_list, summary_error, build_error, build_log_dict['logfilename'], qa_error_list, repoman_error_list) |
| 188 |
cursor.execute(sqlQ, params) |
Archives