| 1 |
commit: 456c57d0a43e96b56aab5eb10857afa0f37820b2 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 22:28:13 2011 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 22:28:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=456c57d0 |
| 7 |
|
| 8 |
fix bugs in setup_profile part2 |
| 9 |
|
| 10 |
--- |
| 11 |
gobs/pym/check_setup.py | 1 + |
| 12 |
gobs/pym/init_setup_profile.py | 8 ++------ |
| 13 |
2 files changed, 3 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py |
| 16 |
index b5f612b..8512470 100644 |
| 17 |
--- a/gobs/pym/check_setup.py |
| 18 |
+++ b/gobs/pym/check_setup.py |
| 19 |
@@ -2,6 +2,7 @@ from __future__ import print_function |
| 20 |
import portage |
| 21 |
import os |
| 22 |
import errno |
| 23 |
+from git import * |
| 24 |
from gobs.text import get_file_text |
| 25 |
|
| 26 |
from gobs.readconf import get_conf_settings |
| 27 |
|
| 28 |
diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/init_setup_profile.py |
| 29 |
index 23a2056..c79b51b 100644 |
| 30 |
--- a/gobs/pym/init_setup_profile.py |
| 31 |
+++ b/gobs/pym/init_setup_profile.py |
| 32 |
@@ -20,11 +20,7 @@ if CM.getName()=='pgsql': |
| 33 |
from gobs.pgsql import * |
| 34 |
|
| 35 |
from gobs.check_setup import check_make_conf, git_pull |
| 36 |
-from gobs.arch import gobs_arch |
| 37 |
from gobs.package import gobs_package |
| 38 |
-from gobs.categories import gobs_categories |
| 39 |
-from gobs.old_cpv import gobs_old_cpv |
| 40 |
-from gobs.categories import gobs_categories |
| 41 |
import portage |
| 42 |
|
| 43 |
def setup_profile_main(args=None): |
| 44 |
@@ -35,7 +31,7 @@ def setup_profile_main(args=None): |
| 45 |
conn=CM.getConnection() |
| 46 |
if args is None: |
| 47 |
args = sys.argv[1:] |
| 48 |
- if args[0] is "-add": |
| 49 |
+ if args[0] == "-add": |
| 50 |
git_pull() |
| 51 |
check_make_conf() |
| 52 |
print "Check configs done" |
| 53 |
@@ -70,7 +66,7 @@ def setup_profile_main(args=None): |
| 54 |
if ebuild_id is not None: |
| 55 |
ebuild_id_list.append(ebuild_id) |
| 56 |
init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageDict, config_cpv_listDict) |
| 57 |
- if args[0] is "-del": |
| 58 |
+ if args[0] == "-del": |
| 59 |
config_id = args[1] |
| 60 |
querue_id_list = get_queue_id_list_config(conn, config_id) |
| 61 |
if querue_id_list is not None: |
Archives