summaryrefslogtreecommitdiff
path: root/libnm/generate-setting-docs.py
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-11-16 17:07:56 -0500
committerDan Winship <danw@redhat.com>2014-11-19 09:24:10 -0500
commite43ba45f2fc808b76c12f511390528cf1148a5f3 (patch)
tree3379f877d6841a04a679c92e9fffeb4763a5c102 /libnm/generate-setting-docs.py
parent36156b70dc06fb235ee91f3f58942c64583fa7ca (diff)
downloadNetworkManager-e43ba45f2fc808b76c12f511390528cf1148a5f3.tar.gz
cli, libnm: don't use D-Bus-specific documentation in nmcli
Now that nm-setting-docs.xml is more D-Bus-specific, it's less appropriate for nmcli's internal documentation. So generate a second copy of the docs without using the overrides file, and use that one for nmcli's documentation.
Diffstat (limited to 'libnm/generate-setting-docs.py')
-rwxr-xr-xlibnm/generate-setting-docs.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index a47794715a..1d99b8621a 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -173,7 +173,8 @@ settings = sorted(settings, key=lambda setting: setting.attrib['{%s}symbol-prefi
init_constants(girxml, settings)
-overrides = ET.parse(args.overrides).getroot()
+if args.overrides is not None:
+ overrides = ET.parse(args.overrides).getroot()
outfile.write("""<?xml version=\"1.0\"?>
<!DOCTYPE nm-setting-docs [
@@ -192,7 +193,10 @@ for settingxml in settings:
outfile.write(" <setting name=\"%s\">\n" % setting.props.name)
setting_properties = { prop.name: prop for prop in GObject.list_properties(setting) }
- setting_overrides = { override.attrib['name']: override for override in overrides.findall('./setting[@name="%s"]/property' % setting.props.name) }
+ if args.overrides is None:
+ setting_overrides = {}
+ else:
+ setting_overrides = { override.attrib['name']: override for override in overrides.findall('./setting[@name="%s"]/property' % setting.props.name) }
properties = sorted(set.union(set(setting_properties.keys()), set(setting_overrides.keys())))