← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to utilities/lsconf.py

  • Committer: Curtis Hovey
  • Date: 2011-12-18 15:13:07 UTC
  • mto: This revision was merged to the branch mainline in revision 14547.
  • Revision ID: curtis.hovey@canonical.com-20111218151307-sdm2gzobt5tplbe0
Moved badges to lp.app.

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
16
14
import os
17
15
import sys
 
16
from optparse import OptionParser
 
17
from operator import attrgetter
18
18
from textwrap import dedent
19
19
 
 
20
import canonical.config
20
21
from lazr.config import ImplicitTypeSchema
21
22
 
22
 
import lp.services.config
23
 
 
24
 
 
25
 
_schema_dir = os.path.abspath(os.path.dirname(lp.services.config.__file__))
 
23
 
 
24
_schema_dir = os.path.abspath(os.path.dirname(canonical.config.__file__))
26
25
_root = os.path.dirname(os.path.dirname(os.path.dirname(_schema_dir)))
27
26
 
28
27
 
126
125
    parser = get_option_parser()
127
126
    (options, arguments) = parser.parse_args(args=argv[1:])
128
127
    if len(arguments) == 0:
129
 
        canonical_config = lp.services.config.config
 
128
        canonical_config = canonical.config.config
130
129
        if options.instance_name:
131
130
            canonical_config.setInstance(options.instance_name)
132
131
        canonical_config._getConfig()