[PATCH 2/3] retire: Ask for password only when required

[Till Maas]

---
 src/fedpkg/cli.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/fedpkg/cli.py b/src/fedpkg/cli.py
index 39aed2a..0f64ca1 100644
--- a/src/fedpkg/cli.py
+++ b/src/fedpkg/cli.py
@@ -13,7 +13,6 @@ from pyrpkg.cli import cliClient
 import sys
 import os
 import logging
-import getpass
 import re
 import subprocess
 import textwrap
@@ -21,7 +20,6 @@ import hashlib
 
 
 import pkgdb2client
-import fedora_cert
 
 
 class fedpkgClient(cliClient):
@@ -81,11 +79,8 @@ class fedpkgClient(cliClient):
                                           {'user': self.cmd.user,
                                           'module': ''})[1]
             branch = self.cmd.branch_merge
-            pkgdb = pkgdb2client.PkgDB()
-            username = fedora_cert.read_user_cert()
-            password = getpass.getpass(
-                "Please enter FAS password for user {0}: ".format(username))
-            pkgdb.login(username, password)
+            pkgdb = pkgdb2client.PkgDB(
+                login_callback=pkgdb2client.ask_password)
             pkgdb.retire_packages(module_name, branch)
         except Exception, e:
             self.log.error('Could not retire package: %s' % e)
-- 
1.8.3.1