~allenap/maas/repackage

Viewing changes to src/maasserver/management/commands/edit_named_options.py

Committer: MaaS Lander
Author(s): Julian Edwards
Date: 2014-03-19 02:33:42 UTC
mfrom: (1745.368.2 fix-named-conf-options)
mto: (1745.444.1 add-version-api) (1704.4.7 dhcp-leases-parsing)
mto: This revision was merged to the branch mainline in revision 2170.
Revision ID: maas_lander-20140319023342-5wstxnyttajgq0gk

[r=jtv][bug=][author=julian-edwards] Fix the management command edit_named_conf. Previously it was setting up an 'include' statement pointing to the wrong path.

files modified:
src/maasserver/management/commands/edit_named_options.py

src/maasserver/tests/test_commands_edit_named_options.py

Show diffs side-by-side

added added

removed removed

src/maasserver/management/commands/edit_named_options.py

def set_up_include_statement(self, options_block, config_path):

"""Insert the 'include' directive into the iscpy-parsed options."""

dir = os.path.dirname(config_path)

options_block['include'] = '"%s/%s"' % (

dir, MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME)

dir = os.path.join(os.path.dirname(config_path), "maas")

options_block['include'] = '"%s%s%s"' % (

dir, os.path.sep, MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME)

def remove_forwarders(self, options_block):

"""Remove existing forwarders from the options block.

Older »