Re: [PATCH v2] scripts: Convert qemu-version.sh to qemu-version.py

[Paolo Bonzini <pbonzini@redhat.com>]

On 05/10/20 21:22, Peter Maydell wrote:
>> +def main(args):
>> +    if len(args) <= 3:
>> +        sys.exit(0)
>> +
>> +    dir = args[1]
>> +    pkgversion = args[2]
>> +    version = args[3]

In addition to what Peter pointed out, all these lines can be changed to

    def main(dir, pkgversion, version, *unused):

and below

    if __name__ == "__main__":
        main(*sys.argv)

>> +    pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],
>> +        stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, cwd=dir)
>> +    if pc.returncode == 0:
>> +        pkgversion = pc.stdout.decode('utf8').strip()
>> +    fullversion = version
>> +    if len(pkgversion) > 0:

Just "if pkgversion:" please.

>> +        fullversion = "{} ({})".format(version, pkgversion)
>> +
>> +    version_header = '''#define QEMU_PKGVERSION "{}"
>> +#define QEMU_FULL_VERSION "{}"'''.format(pkgversion, fullversion)
>> +    sys.stdout.buffer.write(version_header.encode('utf8'))

No need to use buffer and encode, just

    print('#define QEMU_PKGVERSION "%s"' % pkgversion)
    print('#define QEMU_FULLVERSION "%s"' % fullversion)

It is still a bit more clunky than a shell script, but at least not as much.

Paolo