Expand links in the proper order

Signed-off-by: David Zeuthen <davidz@redhat.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/codegen_docbook.py b/src/codegen_docbook.py
index 99bf84e..4e639be 100644
--- a/src/codegen_docbook.py
+++ b/src/codegen_docbook.py
@@ -193,9 +193,9 @@ class DocbookCodeGenerator:
         self.out.write('</refsect2>\n')
 
     def expand(self, s):
-        for key in self.expand_member_dict:
+        for key in self.expand_member_dict_keys:
             s = s.replace(key, self.expand_member_dict[key])
-        for key in self.expand_iface_dict:
+        for key in self.expand_iface_dict_keys:
             s = s.replace(key, self.expand_iface_dict[key])
         return s
 
@@ -218,6 +218,12 @@ class DocbookCodeGenerator:
                 key = '#%s:%s'%(i.name, p.name)
                 value = '<link linkend="gdbus-property-%s.%s">:%s</link>'%(utils.dots_to_hyphens(i.name), p.name, p.name)
                 self.expand_member_dict[key] = value
+        # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
+        # is evaluated before #org.foo.Iface:Media ...
+        self.expand_member_dict_keys = self.expand_member_dict.keys()
+        self.expand_member_dict_keys.sort(reverse=True)
+        self.expand_iface_dict_keys = self.expand_iface_dict.keys()
+        self.expand_iface_dict_keys.sort(reverse=True)
 
     def generate(self):
         self.generate_expand_dicts()