Rev 6544: (gz) Stop complaining about https certificates more than once (Marius Kruger) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6544 [merge]
revision-id: pqm at pqm.ubuntu.com-20120728133959-zmycu56kx99zttog
parent: pqm at pqm.ubuntu.com-20120725125257-5dudj9222zdwgknp
parent: amanic at gmail.com-20120610224808-s7qj3ep4zd21s0u7
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2012-07-28 13:39:59 +0000
message:
  (gz) Stop complaining about https certificates more than once (Marius Kruger)
modified:
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2012-03-09 17:29:54 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2012-06-10 22:48:08 +0000
@@ -68,6 +68,7 @@
     osutils,
     trace,
     transport,
+    ui,
     urlutils,
     )
 lazy_import.lazy_import(globals(), """
@@ -481,7 +482,8 @@
         else:
             host = self.host
         if cert_reqs == ssl.CERT_NONE:
-            trace.warning("Not checking SSL certificate for %s", host)
+            ui.ui_factory.show_user_warning('not_checking_ssl_cert', host=host)
+            ui.ui_factory.suppressed_warnings.add('not_checking_ssl_cert')
             ca_certs = None
         else:
             if self.ca_certs is None:

=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py	2011-12-18 12:46:49 +0000
+++ b/bzrlib/ui/__init__.py	2012-06-10 22:48:08 +0000
@@ -166,6 +166,8 @@
             "  bzr upgrade %(basedir)s"),
         locks_steal_dead=(
             u"Stole dead lock %(lock_url)s %(other_holder_info)s."),
+        not_checking_ssl_cert=(
+            u"Not checking SSL certificate for %(host)s."),
         )
 
     def __init__(self):