From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-761340-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7B3501389E2
for <garchives@archives.gentoo.org>; Thu, 1 Jan 2015 17:44:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 835E6E08D1;
Thu, 1 Jan 2015 17:44:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AEB01E08D3
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Jan 2015 17:44:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 43F3D34065F
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Jan 2015 17:44:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E6A65EA65
for <gentoo-commits@lists.gentoo.org>; Thu, 1 Jan 2015 17:44:53 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <dolsen@gentoo.org>
Message-ID: <1419977224.7813ed25a711a2e13d3f9dcf0896e5b45db69501.dolsen@gentoo>
Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
X-VCS-Repository: proj/gentoo-keys
X-VCS-Files: gkeys/gkeys/base.py
X-VCS-Directories: gkeys/gkeys/
X-VCS-Committer: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 7813ed25a711a2e13d3f9dcf0896e5b45db69501
X-VCS-Branch: master
Date: Thu, 1 Jan 2015 17:44:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8c629048-3f75-43e1-af37-fa66d492c5bc
X-Archives-Hash: 188342600560f72f7e6d8ab2c57c1f3e
commit: 7813ed25a711a2e13d3f9dcf0896e5b45db69501
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 30 18:42:40 2014 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 22:07:04 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=7813ed25
gkeys/base.py: Sort the _option_* functions
---
gkeys/gkeys/base.py | 101 +++++++++++++++++++++++++++-------------------------
1 file changed, 53 insertions(+), 48 deletions(-)
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 2ec4375..c9faf0e 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -46,15 +46,40 @@ class CliBase(object):
@staticmethod
+ def _option_status(parser=None):
+ parser.add_argument('-A', '--status', action='store_true',
+ default=False,
+ help='The active status of the member')
+
+ @staticmethod
def _option_all(parser=None):
parser.add_argument('-a', '--all', dest='all',
action='store_true', default=False,
help='Match all inputs arguments in searches')
@staticmethod
+ def _option_category(parser=None):
+ parser.add_argument('-C', '--category',
+ dest='category', default=None,
+ help='The key or seed directory category to use or update')
+
+ @staticmethod
+ def _option_cleankey(parser=None):
+ parser.add_argument('--clean-key',
+ dest='cleankey', default=False,
+ help='Clean the key from the keyring due to failures')
+
+ @staticmethod
+ def _option_cleanseed(parser=None):
+ parser.add_argument('--clean-seed',
+ dest='cleanseed', default=False,
+ help='Clean the seed from the seedfile due to failures. '
+ 'Used during binary keyring release creation.')
+
+ @staticmethod
def _option_dest(parser=None):
parser.add_argument('-d', '--dest', dest='destination', default=None,
- help='The destination seed file or keydir for move, copy operations')
+ help='The destination for move, copy, create operations')
@staticmethod
def _option_exact(parser=None):
@@ -63,6 +88,17 @@ class CliBase(object):
help='Use CASE matching in searches')
@staticmethod
+ def _option_file(parser=None):
+ parser.add_argument('-F', '--file', dest='filename', default=None,
+ nargs='+',
+ help='The path/URL to use for the (signed) file')
+
+ @staticmethod
+ def _option_1file(parser=None):
+ parser.add_argument('-F', '--file', dest='filename', default=None,
+ help='The path/URL to use for the (signed) file')
+
+ @staticmethod
def _option_fingerprint(parser=None):
parser.add_argument('-f', '--fingerprint', dest='fingerprint',
default=None, nargs='+',
@@ -74,12 +110,23 @@ class CliBase(object):
help='Do a gpg search operations, rather than a gkey search')
@staticmethod
+ def _option_homedir(parser=None):
+ parser.add_argument('-H', '--homedir', dest='homedir', default=None,
+ help='The destination for the generated key')
+
+ @staticmethod
def _option_keyid(parser=None):
parser.add_argument('-i', '--keyid', dest='keyid', default=None,
nargs='+',
help='The long keyid of the gpg key to search for')
@staticmethod
+ def _option_justdoit(parser=None):
+ parser.add_argument('--justdoit', dest='justdoit',
+ action='store_true', default=False,
+ help='Just Do It')
+
+ @staticmethod
def _option_keyring(parser=None):
parser.add_argument('-k', '--keyring', dest='keyring', default=None,
help='The name of the keyring to use for verification, etc.')
@@ -91,6 +138,11 @@ class CliBase(object):
help='The name of the keyring to use for verification, etc.')
@staticmethod
+ def _option_mail(parser=None):
+ parser.add_argument('-m', '--mail', dest='mail', default=None,
+ help='The email address to search for')
+
+ @staticmethod
def _option_nick(parser=None):
parser.add_argument('-n', '--nick', dest='nick', default=None,
help='The nick associated with the the key')
@@ -106,25 +158,6 @@ class CliBase(object):
default=None, help='The name of the the key')
@staticmethod
- def _option_category(parser=None):
- parser.add_argument('-C', '--category',
- dest='category', default=None,
- help='The key or seed directory category to use or update')
-
- @staticmethod
- def _option_cleankey(parser=None):
- parser.add_argument('--clean-key',
- dest='cleankey', default=False,
- help='Clean the key from the keyring due to failures')
-
- @staticmethod
- def _option_cleanseed(parser=None):
- parser.add_argument('--clean-seed',
- dest='cleanseed', default=False,
- help='Clean the seed from the seedfile due to failures. '
- 'Used during binary keyring release creation.')
-
- @staticmethod
def _option_keydir(parser=None):
parser.add_argument('-r', '--keydir', dest='keydir', default=None,
help='The keydir to use, update or search for/in')
@@ -135,17 +168,6 @@ class CliBase(object):
help='The seedfile to use from the gkeys.conf file')
@staticmethod
- def _option_file(parser=None):
- parser.add_argument('-F', '--file', dest='filename', default=None,
- nargs='+',
- help='The path/URL to use for the (signed) file')
-
- @staticmethod
- def _option_1file(parser=None):
- parser.add_argument('-F', '--file', dest='filename', default=None,
- help='The path/URL to use for the (signed) file')
-
- @staticmethod
def _option_signature(parser=None):
parser.add_argument('-s','--signature', dest='signature', default=None,
help='The path/URL to use for the signature')
@@ -157,23 +179,6 @@ class CliBase(object):
help='Turn on timestamp use')
@staticmethod
- def _option_mail(parser=None):
- parser.add_argument('-m', '--mail', dest='mail', default=None,
- help='The email address to search for')
-
- @staticmethod
- def _option_status(parser=None):
- parser.add_argument('-A', '--status', action='store_true',
- default=False,
- help='The active status of the member')
-
- @staticmethod
- def _option_justdoit(parser=None):
- parser.add_argument('--justdoit', dest='justdoit',
- action='store_true', default=False,
- help='Just Do It')
-
- @staticmethod
def _option_uid(parser=None):
parser.add_argument('-u', '--uid', dest='uid', nargs='*', default=None,
help='The user ID, gpg key uid')