IntenseWebs/freeipa
3
0 Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-10-25 14:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix to ipachangeconf docstrings

Browse Source 
https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Stanislav Laznicka authored and Jan Cholasta committed 2016-11-11 12:13:56 +01:00
1 parent 0914a3aeb7
commit 990e1acb1a
1 file changed
+22 -18
Download Patch File Download Diff File Expand all files Collapse all files
ipaclient/ipachangeconf.py
+22 -18
View File
@@ -395,15 +395,15 @@ class IPAChangeConf(object):
raise SyntaxError('Unknown type: [%s]' % no['type'])
def merge(self, oldopts, newopts):
#Use a two pass strategy
#First we create a new opts tree from oldopts removing/commenting
# the options as indicated by the contents of newopts
#Second we fill in the new opts tree with options as indicated
# in the newopts tree (this is becaus eentire (sub)sections may
# in the newopts tree (this is becaus entire (sub)sections may
# exist in the newopts that do not exist in oldopts)
"""
Uses a two pass strategy:
First we create a new opts tree from oldopts removing/commenting
the options as indicated by the contents of newopts
Second we fill in the new opts tree with options as indicated
in the newopts tree (this is becaus eentire (sub)sections may
in the newopts tree (this is becaus entire (sub)sections may
exist in the newopts that do not exist in oldopts)
"""
opts = self.mergeOld(oldopts, newopts)
self.mergeNew(opts, newopts)
return opts
@@ -473,12 +473,14 @@ class IPAChangeConf(object):
return opts
# Write settings to configuration file
# file is a path
# options is a set of dictionaries in the form:
# [{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}]
# section is a section name like 'global'
def changeConf(self, file, newopts):
"""
Write settings to configuration file
:param file: path to the file
:param options: set of dictionaries in the form:
{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}
:param section: section name like 'global'
"""
output = ""
f = None
try:
@@ -506,11 +508,13 @@ class IPAChangeConf(object):
pass
return True
# Write settings to new file, backup old
# file is a path
# options is a set of dictionaries in the form:
# [{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}]
def newConf(self, file, options):
""""
Write settings to a new file, backup the old
:param file: path to the file
:param options: a set of dictionaries in the form:
{'name': 'foo', 'value': 'bar', 'action': 'set/comment'}
"""
output = ""
f = None
try: