aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-06-15 22:15:28 -0700
committerBrian Dolbec <dolsen@gentoo.org>2014-06-15 22:15:28 -0700
commit2a3dc328bfbfd4e0e777f05c1da57bf9c4305e2c (patch)
tree3dbfec95d99a48f2bbd456b7490d900335e06213 /bin
parentman/emerge.1: Make the --alert example more safe (diff)
downloadportage-2a3dc328bfbfd4e0e777f05c1da57bf9c4305e2c.tar.gz
portage-2a3dc328bfbfd4e0e777f05c1da57bf9c4305e2c.tar.bz2
portage-2a3dc328bfbfd4e0e777f05c1da57bf9c4305e2c.zip
repoman: Fix broken userquery import
Commit: 15433c52866e09967142fd2352bd7aad9ad5026f Author: Alexander Berntsen <bernalex@gentoo.org> (Thu 08 May 2014 08:47:58 AM PDT) Subject: emerge: Implement "--alert"
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index a63224632..c36ace134 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)