commit:     22aa17dc61efbaa00ca24f32216a5ee5fc409221
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 16 20:08:41 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jun 16 20:08:41 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=22aa17dc

sync/modules/rsync: Update the userquery import and use

Userquery has been made a new class in a new file.
This change uses the new UserQuery class.

---
 pym/portage/sync/modules/rsync/rsync.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/portage/sync/modules/rsync/rsync.py 
b/pym/portage/sync/modules/rsync/rsync.py
index 730093f..76d83f2 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -20,7 +20,7 @@ warn = create_color_func("WARN")
 from portage.const import VCS_DIRS, TIMESTAMP_FORMAT, RSYNC_PACKAGE_ATOM
 from portage.util import writemsg, writemsg_stdout
 from portage.sync.getaddrinfo_validate import getaddrinfo_validate
-from _emerge.userquery import userquery
+from _emerge.UserQuery import UserQuery
 from portage.sync.syncbase import SyncBase
 
 
@@ -194,7 +194,8 @@ class RsyncSync(SyncBase):
 
                        if (retries==0):
                                if "--ask" in opts:
-                                       if userquery("Do you want to sync your 
Portage tree " + \
+                                       uq = UserQuery(opts)
+                                       if uq.query("Do you want to sync your 
Portage tree " + \
                                                "with the mirror at\n" + 
blue(dosyncuri) + bold("?"),
                                                enter_invalid) == "No":
                                                print()

Reply via email to