From 08db73a8de7d3aa462b81c69226dd1a3abe1fb59 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Fri, 29 Jan 2010 16:24:57 -0800
Subject: Use the new fedora_cert method to get a user name

---
 src/fedpkg.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/fedpkg.py')

diff --git a/src/fedpkg.py b/src/fedpkg.py
index 8f421be..2cafd29 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -12,6 +12,7 @@
 
 import argparse
 import fedpkg
+import fedora_cert
 import os
 import sys
 import logging
@@ -95,8 +96,13 @@ def clog(args):
 
 def clone(args):
     if not args.user:
-        # Use a method to scrape user from fedora cert here
-        args.user = os.getlogin()
+        # 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:
+            args.user = fedora_cert.read_user_cert()
+        except:
+            log.debug('Could not read Fedora cert, using login name')
+            args.user = os.getlogin()
     if args.branches:
         fedpkg.clone_with_dirs(args.module[0], args.user)
     else:
-- 
cgit