← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to utilities/lsconf.py

  • Committer: Rick Harding
  • Date: 2012-01-05 21:28:01 UTC
  • mto: This revision was merged to the branch mainline in revision 14648.
  • Revision ID: rick.harding@canonical.com-20120105212801-t96zn8mnegqsa3yy
garden

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/lsconf.py
11
11
# pylint: disable-msg=W0403
12
12
import _pythonpath
13
13
 
 
14
from operator import attrgetter
 
15
from optparse import OptionParser
14
16
import os
15
17
import sys
16
 
from optparse import OptionParser
17
 
from operator import attrgetter
18
18
from textwrap import dedent
19
19
 
20
 
import canonical.config
21
20
from lazr.config import ImplicitTypeSchema
22
21
 
23
 
 
24
 
_schema_dir = os.path.abspath(os.path.dirname(canonical.config.__file__))
 
22
import lp.services.config
 
23
 
 
24
 
 
25
_schema_dir = os.path.abspath(os.path.dirname(lp.services.config.__file__))
25
26
_root = os.path.dirname(os.path.dirname(os.path.dirname(_schema_dir)))
26
27
 
27
28
 
125
126
    parser = get_option_parser()
126
127
    (options, arguments) = parser.parse_args(args=argv[1:])
127
128
    if len(arguments) == 0:
128
 
        canonical_config = canonical.config.config
 
129
        canonical_config = lp.services.config.config
129
130
        if options.instance_name:
130
131
            canonical_config.setInstance(options.instance_name)
131
132
        canonical_config._getConfig()