diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-05-02 20:59:20 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-05-02 20:59:20 +0000 |
| commit | 4d84d67e5713cd0de5761fe6485aa4fcf57c2704 (patch) | |
| tree | 8d13fddb2baf795389f7595c992de32260ee9580 /build_tools | |
| parent | 3232e23ca7c30a143203e29e74ffe86787531acc (diff) | |
Migrate AMI VarSet events raised by GoSub local variables
This patch moves VarSet events for local variables raised by GoSub
over to Stasis-Core. It also tweaks up the post-processing documentation
scripts to not combine parameters if both parameters are already documented.
(issue ASTERISK-21462)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@387519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/post_process_documentation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/post_process_documentation.py b/build_tools/post_process_documentation.py index b2d9e5e72..678328dd3 100644 --- a/build_tools/post_process_documentation.py +++ b/build_tools/post_process_documentation.py @@ -22,9 +22,9 @@ def merge_parameter_information(managerEvent): def __swap_parameter_documentation(one, two): # See who has the better documentation and use it - if (one.hasChildNodes()): + if (one.hasChildNodes() and not two.hasChildNodes()): two.parentNode.replaceChild(one.cloneNode(True), two) - elif (two.hasChildNodes()): + elif (two.hasChildNodes() and not one.hasChildNodes()): one.parentNode.replaceChild(two.cloneNode(True), one) def __merge_parameter(param, other_instances): |