Skip to content

fix gdbus-codegen --interface-info-{header,body}

Will Thompson requested to merge wjt/glib:fix-gdbus-codegen--interface-info into master

Since 1217b1bc, LICENSE_STR has taken two parameters, not one. Without this change, running either mode fails with a traceback like:

Traceback (most recent call last):
  File "../gdbus-codegen", line 55, in <module>
    sys.exit(codegen_main.codegen_main())
  File ".../codegen_main.py", line 294, in codegen_main
    gen.generate()
  File ".../codegen.py", line 896, in generate
    self.generate_body_preamble()
  File ".../codegen.py", line 682, in generate_body_preamble
    self.outfile.write(LICENSE_STR.format(config.VERSION))
IndexError: tuple index out of range

8916874e / !13 (merged), which introduced these flags, was actually merged after that commit, but I assume it was written beforehand.

I also found that method/signal arguments were sorted by name, which is not correct: they're just positional on the wire.

Fixed both, and added a small smoke-test.

Edited by Will Thompson

Merge request reports