[gentoo-commits] proj/portage:master commit in: bin/

[Brian Dolbec]

commit:     2a3dc328bfbfd4e0e777f05c1da57bf9c4305e2c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 16 05:15:28 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jun 16 05:15:28 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2a3dc328

repoman: Fix broken userquery import

Commit: 15433c52866e09967142fd2352bd7aad9ad5026f
Author: Alexander Berntsen <bernalex <AT> gentoo.org> (Thu 08 May 2014 08:47:58 
AM PDT)
Subject: emerge: Implement "--alert"

---
 bin/repoman | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index a632246..c36ace1 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -62,7 +62,7 @@ from repoman import utilities
 from repoman.herdbase import make_herd_base
 from _emerge.Package import Package
 from _emerge.RootConfig import RootConfig
-from _emerge.userquery import userquery
+from _emerge.UserQuery import UserQuery
 import portage.checksum
 import portage.const
 import portage.repository.config
@@ -2880,7 +2880,8 @@ else:
        logging.info("myupdates: %s", myupdates)
        logging.info("myheaders: %s", myheaders)
 
-       if options.ask and userquery('Commit changes?', True) != 'Yes':
+       uq = UserQuery(options)
+       if options.ask and uq.query('Commit changes?', True) != 'Yes':
                print("* aborting commit.")
                sys.exit(128 + signal.SIGINT)