← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/__init__.py
54
54
from bzrlib import (
55
55
    branch as _mod_branch,
56
56
    bzrdir,
 
57
    config as _mod_config,
57
58
    lazy_regex,
58
59
    # Since we are a built-in plugin we share the bzrlib version
59
60
    version_info,
72
73
    )
73
74
from bzrlib.help_topics import topic_registry
74
75
from bzrlib.option import (
75
 
        Option,
76
 
        ListOption,
77
 
)
 
76
    Option,
 
77
    ListOption,
 
78
    )
78
79
 
79
80
 
80
81
class cmd_register_branch(Command):
507
508
    info = _get_package_branch_info(the_branch.base)
508
509
    if info is None:
509
510
        return
510
 
    c = the_branch.get_config()
511
 
    verbosity = c.get_user_option('launchpad.packaging_verbosity')
512
 
    if verbosity is not None:
513
 
        verbosity = verbosity.lower()
514
 
    if verbosity == 'off':
 
511
    c = the_branch.get_config_stack()
 
512
    verbosity = c.get('launchpad.packaging_verbosity')
 
513
    if not verbosity:
515
514
        trace.mutter('not checking %s because verbosity is turned off'
516
515
                     % (the_branch.base,))
517
516
        return
577
576
topic_registry.register('launchpad',
578
577
    _launchpad_help,
579
578
    'Using Bazaar with Launchpad.net')
 
579
 
 
580
_mod_config.option_registry.register(
 
581
    _mod_config.Option('launchpad.packaging_verbosity', default=True,
 
582
          from_unicode=_mod_config.bool_from_store,
 
583
          help="""\
 
584
Whether to warn if a UDD package import branch is accessed that is out of date.
 
585
 
 
586
Setting this option to 'off' will disable verbosity.
 
587
"""))
 
588
_mod_config.option_registry.register(
 
589
    _mod_config.Option('launchpad_username', default=None,
 
590
        help="The username to login with when conneting to Launchpad."))