| 1 |
commit: df9aee3cadb80863146a5a352bef9885268658d3 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 1 21:13:53 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 1 21:13:53 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=df9aee3c |
| 7 |
|
| 8 |
fix some CM.putConnection(conn) |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/bin/gobs_portage_hooks | 75 ------------------------------------------- |
| 12 |
gobs/pym/package.py | 1 + |
| 13 |
2 files changed, 1 insertions(+), 75 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gobs/bin/gobs_portage_hooks b/gobs/bin/gobs_portage_hooks |
| 16 |
deleted file mode 100755 |
| 17 |
index bf574dc..0000000 |
| 18 |
--- a/gobs/bin/gobs_portage_hooks |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,75 +0,0 @@ |
| 21 |
-#!/usr/bin/python |
| 22 |
-from __future__ import print_function |
| 23 |
-import os |
| 24 |
-import sys |
| 25 |
-# Get the options from the config file set in gobs.readconf |
| 26 |
-from gobs.readconf import get_conf_settings |
| 27 |
-reader=get_conf_settings() |
| 28 |
-gobs_settings_dict=reader.read_gobs_settings_all() |
| 29 |
-# make a CM |
| 30 |
-from gobs.ConnectionManager import connectionManager |
| 31 |
-CM=connectionManager(gobs_settings_dict) |
| 32 |
-#selectively import the pgsql/mysql querys |
| 33 |
-if CM.getName()=='pgsql': |
| 34 |
- from gobs.pgsql import * |
| 35 |
- |
| 36 |
-from gobs.package import gobs_package |
| 37 |
-from gobs.build_log import gobs_buildlog |
| 38 |
-from gobs.flags import gobs_use_flags |
| 39 |
-from portage.util import writemsg, writemsg_level, writemsg_stdout |
| 40 |
-import portage |
| 41 |
- |
| 42 |
-def get_build_dict_db(mysettings, config_profile, gobs_settings_dict): |
| 43 |
- conn=CM.getConnection() |
| 44 |
- myportdb = portage.portdbapi(mysettings=mysettings) |
| 45 |
- categories = os.environ['CATEGORY'] |
| 46 |
- package = os.environ['PN'] |
| 47 |
- ebuild_version = os.environ['PVR'] |
| 48 |
- cpv = categories + "/" + package + "-" + ebuild_version |
| 49 |
- init_package = gobs_package(mysettings, myportdb) |
| 50 |
- package_id = have_package_db(conn, categories, package) |
| 51 |
- # print("package_id %s" % package_id, file=sys.stdout) |
| 52 |
- build_dict = {} |
| 53 |
- mybuild_dict = {} |
| 54 |
- build_dict['ebuild_version'] = ebuild_version |
| 55 |
- build_dict['package_id'] = package_id |
| 56 |
- build_dict['cpv'] = cpv |
| 57 |
- build_dict['categories'] = categories |
| 58 |
- build_dict['package'] = package |
| 59 |
- build_dict['config_profile'] = config_profile |
| 60 |
- init_useflags = gobs_use_flags(mysettings, myportdb, cpv) |
| 61 |
- iuse_flags_list, final_use_list = init_useflags.get_flags_looked() |
| 62 |
- #print 'final_use_list', final_use_list |
| 63 |
- if final_use_list != []: |
| 64 |
- build_dict['build_useflags'] = final_use_list |
| 65 |
- else: |
| 66 |
- build_dict['build_useflags'] = None |
| 67 |
- #print "build_dict['build_useflags']", build_dict['build_useflags'] |
| 68 |
- pkgdir = os.path.join(mysettings['PORTDIR'], categories + "/" + package) |
| 69 |
- ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + package + "-" + ebuild_version + ".ebuild")[0] |
| 70 |
- build_dict['checksum'] = ebuild_version_checksum_tree |
| 71 |
- ebuild_id = get_ebuild_id_db_checksum(conn, build_dict) |
| 72 |
- if ebuild_id is None: |
| 73 |
- #print 'have any ebuild', get_ebuild_checksum(conn, package_id, ebuild_version) |
| 74 |
- init_package.update_ebuild_db(build_dict) |
| 75 |
- ebuild_id = get_ebuild_id_db_checksum(conn, build_dict) |
| 76 |
- build_dict['ebuild_id'] = ebuild_id |
| 77 |
- queue_id = check_revision(conn, build_dict) |
| 78 |
- if queue_id is None: |
| 79 |
- build_dict['queue_id'] = None |
| 80 |
- else: |
| 81 |
- build_dict['queue_id'] = queue_id |
| 82 |
- return build_dict |
| 83 |
- |
| 84 |
-def main(): |
| 85 |
- # Main |
| 86 |
- config_profile = gobs_settings_dict['gobs_config'] |
| 87 |
- #we provide the main_loop with the ConnectionManager so we can hand out connections from within the loop |
| 88 |
- mysettings = portage.settings |
| 89 |
- build_dict = get_build_dict_db( mysettings, config_profile, gobs_settings_dict) |
| 90 |
- init_buildlog = gobs_buildlog(mysettings, build_dict) |
| 91 |
- init_buildlog.add_buildlog_main() |
| 92 |
- #connectionManager.closeAllConnections() |
| 93 |
- |
| 94 |
-if __name__ == "__main__": |
| 95 |
- main() |
| 96 |
\ No newline at end of file |
| 97 |
|
| 98 |
diff --git a/gobs/pym/package.py b/gobs/pym/package.py |
| 99 |
index 4f1f48f..1f592ee 100644 |
| 100 |
--- a/gobs/pym/package.py |
| 101 |
+++ b/gobs/pym/package.py |
| 102 |
@@ -182,6 +182,7 @@ class gobs_package(object): |
| 103 |
# Get the ebuild list for cp |
| 104 |
ebuild_list_tree = self._myportdb.cp_list((categories + "/" + package), use_cache=1, mytree=None) |
| 105 |
if ebuild_list_tree == []: |
| 106 |
+ CM.putConnection(conn) |
| 107 |
return None |
| 108 |
config_list = get_config_list(conn) |
| 109 |
config_cpv_listDict = self.config_match_ebuild(categories, package, config_list) |
Archives