| 1 |
commit: 5de7600aa8002d11819480315ee6df1b8d768a30 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 22:48:41 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 22:48:41 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=5de7600a |
| 7 |
|
| 8 |
fix bugs in setup_profile part5 |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/pym/init_setup_profile.py | 20 +++++++++++--------- |
| 12 |
1 files changed, 11 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/init_setup_profile.py |
| 15 |
index c79b51b..cc799cb 100644 |
| 16 |
--- a/gobs/pym/init_setup_profile.py |
| 17 |
+++ b/gobs/pym/init_setup_profile.py |
| 18 |
@@ -57,15 +57,17 @@ def setup_profile_main(args=None): |
| 19 |
package = element[1] |
| 20 |
print "C", categories + "/" + package # C = Checking |
| 21 |
pkgdir = mysettings['PORTDIR'] + "/" + categories + "/" + package |
| 22 |
- config_cpv_listDict = init_package.config_match_cp(categories, package, config_id_list) |
| 23 |
- packageDict['ebuild_version_tree'] = config_cpv_listDict['ebuild_version'] |
| 24 |
- build_dict['checksum'] = portage.checksum.sha256hash(pkgdir + "/" + package + "-" + config_cpv_listDict['ebuild_version'] + ".ebuild")[0] |
| 25 |
- build_dict['package_id'] = have_package_db(categories, package) |
| 26 |
- build_dict['ebuild_version'] = config_cpv_listDict['ebuild_version'] |
| 27 |
- ebuild_id = get_ebuild_id_db_checksum(connection, build_dict) |
| 28 |
- if ebuild_id is not None: |
| 29 |
- ebuild_id_list.append(ebuild_id) |
| 30 |
- init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict) |
| 31 |
+ config_cpv_listDict = init_package.config_match_ebuild(categories, package, config_id_list) |
| 32 |
+ if config_cpv_listDict != {}: |
| 33 |
+ packageDict['ebuild_version_tree'] = config_cpv_listDict['ebuild_version'] |
| 34 |
+ build_dict['checksum'] = portage.checksum.sha256hash(pkgdir + "/" + package + "-" + config_cpv_listDict['ebuild_version'] + ".ebuild")[0] |
| 35 |
+ build_dict['package_id'] = have_package_db(categories, package) |
| 36 |
+ build_dict['ebuild_version'] = config_cpv_listDict['ebuild_version'] |
| 37 |
+ ebuild_id = get_ebuild_id_db_checksum(connection, build_dict) |
| 38 |
+ if ebuild_id is not None: |
| 39 |
+ ebuild_id_list.append(ebuild_id) |
| 40 |
+ init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict) |
| 41 |
+ |
| 42 |
if args[0] == "-del": |
| 43 |
config_id = args[1] |
| 44 |
querue_id_list = get_queue_id_list_config(conn, config_id) |
Archives