packagedb-cli-commits November 2014

packagedb-cli-commits@lists.stg.fedorahosted.org

1 participants
115 discussions

[packagedb-cli/pkgdb_admin] Get the shortcuts to approve (a), deny (d) and pass (p) to work
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit ba3999453ed4ea11a3eae40905c0491d3136df61 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:48:11 2014 +0100 Get the shortcuts to approve (a), deny (d) and pass (p) to work pkgdb2client/admin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/pkgdb2client/admin.py b/pkgdb2client/admin.py index 5404080..26c2048 100644 --- a/pkgdb2client/admin.py +++ b/pkgdb2client/admin.py @@ -216,7 +216,7 @@ def _ask_what_to_do(messages): print 'What should we do about this requests?' action = raw_input('approve, deny, pass: ') - if action.lower() not in ['approve', 'deny', 'pass']: + if action.lower() not in ['a', 'd', 'p', 'approve', 'deny', 'pass']: print 'No valid action specified, just ignoring for now' action = 'pass'

1 0

[packagedb-cli/pkgdb_admin] Drop log as it's undefined and catch more AuthError from FAS
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 8bbc49bff6dcf5ca519345ab2ec059b140506395 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:31:49 2014 +0100 Drop log as it's undefined and catch more AuthError from FAS pkgdb2client/utils.py | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index 02957e6..9e92795 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -107,18 +107,31 @@ def __get_fas_user_by_email(email_address): userid = FASCLIENT._AccountSystem__alternate_email[email_address] else: - userid = FASCLIENT.people_query( - constraints={'email': email_address}, - columns=['id'] - ) + try: + userid = FASCLIENT.people_query( + constraints={'email': email_address}, + columns=['id'] + ) + except AuthError: + username, password = pkgdb2client.ask_password() + FASCLIENT.username = username + FASCLIENT.password = password + userid = FASCLIENT.people_query( + constraints={'email': email_address}, + columns=['id'] + ) if userid: userid = userid[0].id user = None if userid: - user = FASCLIENT.person_by_id(userid) - else: - LOG.info('No user id found in FAS for email %s', email_address) + try: + user = FASCLIENT.person_by_id(userid) + except AuthError: + username, password = pkgdb2client.ask_password() + FASCLIENT.username = username + FASCLIENT.password = password + user = FASCLIENT.person_by_id(userid) return user

1 0

[packagedb-cli/pkgdb_admin] Adjust the call via FASCLIENT
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 1ff26cb7eb7f3025a60755897b79ee09908d8cfc Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:24:52 2014 +0100 Adjust the call via FASCLIENT As the FAS client stores its cookie on disk, it is not necessary to ask for the user's credentials every time, instead we can ask them only when FAS says we need to. pkgdb2client/utils.py | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index 3c7ee00..02957e6 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -136,7 +136,13 @@ def is_packager(user): if '@' in user: fas_user = __get_fas_user_by_email(user.strip()) else: - fas_user = FASCLIENT.person_by_username(user) + try: + fas_user = FASCLIENT.person_by_username(user) + except AuthError: + username, password = pkgdb2client.ask_password() + FASCLIENT.username = username + FASCLIENT.password = password + fas_user = FASCLIENT.person_by_username(user) return fas_user \ and 'packager' in fas_user['group_roles'] \ @@ -155,11 +161,6 @@ def check_package_creation(info, bugid): ''' messages = [] - if not FASCLIENT.username: - username, password = pkgdb2client.ask_password() - FASCLIENT.username = username - FASCLIENT.password = password - bug = get_bug(bugid) # Check if the title of the bug fits the expectations @@ -225,11 +226,6 @@ def check_branch_creation(pkgdbclient, pkg_name, clt_name, user): ) # Check if user is a packager - if not FASCLIENT.username: - username, password = pkgdb2client.ask_password() - FASCLIENT.username = username - FASCLIENT.password = password - if not is_packager(user): messages.append(' ! User {0} is not a packager'.format(user))

1 0

[packagedb-cli/pkgdb_admin] Inform the user if an email address does not correspond to a FAS user
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit beb5b931f58125745cb9a5ade741f748a4ba11c6 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:24:26 2014 +0100 Inform the user if an email address does not correspond to a FAS user pkgdb2client/utils.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index 9947796..3c7ee00 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -117,6 +117,8 @@ def __get_fas_user_by_email(email_address): user = None if userid: user = FASCLIENT.person_by_id(userid) + else: + LOG.info('No user id found in FAS for email %s', email_address) return user

1 0

[packagedb-cli/pkgdb_admin] Adjust __get_fas_user_by_email
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit a9a46c99097f02d16c4a4425c40dbd5181bed996 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:22:28 2014 +0100 Adjust __get_fas_user_by_email We might have situations where the email address does not correspond to an user in FAS, we should be able to handle such situation. pkgdb2client/utils.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index be7352e..9947796 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -110,9 +110,13 @@ def __get_fas_user_by_email(email_address): userid = FASCLIENT.people_query( constraints={'email': email_address}, columns=['id'] - )[0].id + ) + if userid: + userid = userid[0].id - user = FASCLIENT.person_by_id(userid) + user = None + if userid: + user = FASCLIENT.person_by_id(userid) return user

1 0

[packagedb-cli/pkgdb_admin] Rework the get_bug method to ask for login only if needed
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 0c6bbe9a984f4a1a53c3f579e99de48af0746f20 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:20:14 2014 +0100 Rework the get_bug method to ask for login only if needed Before calling bugzilla we do not know if the user can log in or not. We could call .login() but that would require asking the user for his/her username and password everytime. So instead we query bugzilla once, and based on the output we determine if we need to call .login() or not (as bugzilla stores a token on disk credentials are not necessary for every calls). pkgdb2client/utils.py | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index a6e4edb..be7352e 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -59,21 +59,20 @@ def get_bugz(pkg_name): return bugbz -def get_bug(bugid, login=False): +def get_bug(bugid): ''' Return the bug with the specified identifier. :arg bugid: the identifier of the bug to retrieve - :kwarg login: a boolean specifying whether to retrieve the information - about this bug with a user logged in or not. :returns: the list of the people (their email address) that commented on the specified ticket ''' - if login and not BZCLIENT.logged_in: + bug = BZCLIENT.getbug(bugid) + if not '@' in bug.creator: bz_login() - - return BZCLIENT.getbug(bugid) + bug = BZCLIENT.getbug(bugid) + return bug def get_users_in_bug(bugid): @@ -86,9 +85,9 @@ def get_users_in_bug(bugid): ''' - if isinstance(bugid, (int, basestring)): - bugbz = get_bug(bugid, login=True) - else: + try: + bugbz = get_bug(int(bugid)) + except ValueError: bugbz = bugid users = set([com['author'] for com in bugbz.comments]) users.add(bugbz.creator) @@ -155,7 +154,7 @@ def check_package_creation(info, bugid): FASCLIENT.username = username FASCLIENT.password = password - bug = get_bug(bugid, login=True) + bug = get_bug(bugid) # Check if the title of the bug fits the expectations expected = 'Review Request: {0} - {1}'.format(

1 0

[packagedb-cli/pkgdb_admin] Retrieve the username and use it when creating the FAS client
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 2bf09acaf87b5cec09e854f97d22aa3b9c19bc53 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 11:17:38 2014 +0100 Retrieve the username and use it when creating the FAS client The username allowing to load/save the session data from the filesystem pkgdb2client/utils.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index 74aef5d..a6e4edb 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -18,13 +18,22 @@ import getpass from bugzilla import Bugzilla +import fedora_cert from fedora.client import AccountSystem, AuthError import pkgdb2client +try: + USERNAME = fedora_cert.read_user_cert() +except fedora_cert.fedora_cert_error: + LOG.debug('Could not read Fedora cert, asking for username') + USERNAME = None + RH_BZ_API = 'https://bugzilla.redhat.com/xmlrpc.cgi' BZCLIENT = Bugzilla(url=RH_BZ_API) -FASCLIENT = AccountSystem('https://admin.fedoraproject.org/accounts') +FASCLIENT = AccountSystem( + 'https://admin.fedoraproject.org/accounts', + username=USERNAME) def bz_login():

1 0

[packagedb-cli/pkgdb_admin] Full path imports and allow to use single letter code to pass (p) or deny (d) an action
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 60b9f2386ee18946a8521f4a6eae18f8dbdfb8cc Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 10:54:21 2014 +0100 Full path imports and allow to use single letter code to pass (p) or deny (d) an action pkgdb2client/admin.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/pkgdb2client/admin.py b/pkgdb2client/admin.py index 4d60654..5404080 100644 --- a/pkgdb2client/admin.py +++ b/pkgdb2client/admin.py @@ -25,7 +25,7 @@ import koji from pkgdb2client import PkgDB, PkgDBException, __version__ from cli import ActionError import pkgdb2client -import utils +import pkgdb2client.utils as utils pkgdbclient = PkgDB('https://admin.fedoraproject.org/pkgdb', @@ -307,12 +307,12 @@ def do_process(args): ) decision = _ask_what_to_do(msgs) - if decision == 'pass': + if decision in ('pass', 'p'): data = { 'messages': ['Action {0} un-touched'.format(args.actionid)] } - elif decision == 'deny': + elif decision in ('deny', 'd'): data = pkgdbclient.handle_api_call( '/admin/action/status', data={

1 0

[packagedb-cli/pkgdb_admin] Raise an exception with the error message only when there is one
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit 46e2ec8c2757a8938ca7e235d7b686abac9af4a9 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 24 10:53:51 2014 +0100 Raise an exception with the error message only when there is one pkgdb2client/__init__.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/pkgdb2client/__init__.py b/pkgdb2client/__init__.py index c106fb0..8d1f730 100644 --- a/pkgdb2client/__init__.py +++ b/pkgdb2client/__init__.py @@ -353,7 +353,10 @@ class PkgDB(object): if response.status_code != 200: LOG.debug('full output: {0}'.format(output)) - raise PkgDBException(output['error']) + if output and 'error' in output: + raise PkgDBException(output['error']) + else: + raise PkgDBException(output) return output

1 0

[packagedb-cli/pkgdb_admin: 37/37] Display the human-readable description of the action before processing it
by Pierre-YvesChibon 24 Nov '14

24 Nov '14

commit cb6c38d6771232a9c3538e53dedd52a2877a721d Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Fri Oct 10 12:45:28 2014 +0200 Display the human-readable description of the action before processing it pkgdb2client/admin.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) --- diff --git a/pkgdb2client/admin.py b/pkgdb2client/admin.py index aa16a39..4d60654 100644 --- a/pkgdb2client/admin.py +++ b/pkgdb2client/admin.py @@ -232,6 +232,8 @@ def do_process(args): action = pkgdbclient.handle_api_call('/admin/action/%s' % args.actionid) + print _action2msg(action) + if action['status'] != 'Awaiting Review': print 'Action #%s is not Awaiting Review - Current status: %s' % ( action['id'], action['status'])

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

packagedb-cli-commits November 2014