luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 01:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-codegen: Tidy up version comparisons

Browse Source 
Python tuple comparisons actually do what we want for comparing major
and minor versions, so tidy things up by using that.

This introduces no functional changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall
2020-01-31 12:23:22 +00:00
parent 9734e4854e
commit 087b9829f4
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gdbus-2.0/codegen/codegen_main.py
View File

@@ -251,8 +251,7 @@ def codegen_main():
print_error('Unrecognized --glib-min-required string ‘{}’'.format(
args.glib_min_required))
if glib_min_required[0] < 2 or \
(glib_min_required[0] == 2 and glib_min_required[1] < 30):
if glib_min_required < (2, 30):
print_error('Invalid --glib-min-required string ‘{}’: minimum '
'version is 2.30'.format(args.glib_min_required))
else:
@@ -280,17 +279,13 @@ def codegen_main():
print_error('Invalid versions: --glib-min-required ({}) must be '
'less than or equal to --glib-max-allowed ({})'.format(glib_min_required, glib_max_allowed))
glib_min_required_is_2_64 = (glib_min_required[0] > 2 or
(glib_min_required[0] == 2 and
glib_min_required[1] >= 64))
all_ifaces = []
input_files_basenames = []
for fname in sorted(args.files + args.xml_files):
with open(fname, 'rb') as f:
xml_data = f.read()
parsed_ifaces = parser.parse_dbus_xml(xml_data,
h_type_implies_unix_fd=glib_min_required_is_2_64)
h_type_implies_unix_fd=(glib_min_required >= (2, 64)))
all_ifaces.extend(parsed_ifaces)
input_files_basenames.append(os.path.basename(fname))