summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2011-01-22 16:04:06 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-01-22 16:34:32 +0100
commitcbb28c4a5086fbd1959ac75f7053ed11a97808f8 (patch)
tree7dc7a59869e8addf9ca7839ef2d4994a3518226e
parent5372ed6fe3cd64d8196e3b4a2c543ee0f0f2cfca (diff)
downloadfedora-packager-cbb28c4a5086fbd1959ac75f7053ed11a97808f8.tar.gz
fedora-packager-cbb28c4a5086fbd1959ac75f7053ed11a97808f8.tar.xz
fedora-packager-cbb28c4a5086fbd1959ac75f7053ed11a97808f8.zip
local ops: Wrap args.user into old getuser() code
-rwxr-xr-xsrc/fedpkg.py36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index 33b4e36..ec1c1a5 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -292,7 +292,7 @@ def build(args):
chain = None
if hasattr(args, 'chain'):
chain = args.chain
- user = getuser(args.user)
+ user = args.user
# Need to do something with BUILD_FLAGS or KOJI_FLAGS here for compat
try:
mymodule = pyfedpkg.PackageModule(args)
@@ -397,18 +397,6 @@ def chainbuild(args):
args.scratch = False
build(args)
-def getuser(user=None):
- if user:
- return user
- else:
- # Doing a try doesn't really work since the fedora_cert library just
- # exits on error, but if that gets fixed this will work better.
- try:
- return fedora_cert.read_user_cert()
- except:
- log.debug('Could not read Fedora cert, using login name')
- return os.getlogin()
-
def check(args):
# not implimented; Not planned
@@ -438,9 +426,7 @@ def clog(args):
def clone(args):
user = None
if not args.anonymous:
- # Doing a try doesn't really work since the fedora_cert library just
- # exits on error, but if that gets fixed this will work better.
- user = getuser(args.user)
+ user = args.user
try:
if args.branches:
pyfedpkg.clone_with_dirs(args.module[0], user)
@@ -721,7 +707,7 @@ def tag(args):
sys.exit(1)
def tagrequest(args):
- user = getuser(args.user)
+ user = args.user
passwd = getpass.getpass('Password for %s: ' % user)
if not args.desc:
@@ -749,7 +735,7 @@ def unusedpatches(args):
def update(args):
"""Submit a new update to bodhi"""
- user = getuser(args.user)
+ user = args.user
try:
mymodule = pyfedpkg.PackageModule(args)
except pyfedpkg.FedpkgError, e:
@@ -854,6 +840,20 @@ class WrapArgs(object):
def __init__(self, args):
self.__args = args
+ self._user = None
+
+ def user(self):
+ if self._user:
+ return self._user
+ # Doing a try doesn't really work since the fedora_cert library just
+ # exits on error, but if that gets fixed this will work better.
+ try:
+ return fedora_cert.read_user_cert()
+ except:
+ log.debug('Could not read Fedora cert, using login name')
+ return os.getlogin()
+
+ user = property(user)
def __getattr__(self, name):
if name in self.__dict__: