]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
make-autosuspend-rules: restore compatibility with Python3 < 3.6
authorLuca Boccassi <luca.boccassi@microsoft.com>
Tue, 23 Jun 2020 10:45:50 +0000 (11:45 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 23 Jun 2020 19:02:15 +0000 (21:02 +0200)
The f'...' format was introduced in Python 3.6 ( https://www.python.org/dev/peps/pep-0498/ )
and returns an error when systemd is built on a system with an older Python3 version:

<...>
  File /home/bluca/git/systemd/tools/make-autosuspend-rules.py, line 15
    print(f'pci:v{vendor:08X}d{device:08X}*')
                                           ^
SyntaxError: invalid syntax
[2/388] Generating version.h with a custom command.
ninja: build stopped: subcommand failed.
$ python3 --version
Python 3.5.6

Use an older format to keep backward compatibility.

tools/make-autosuspend-rules.py

index 065752ced4720c76147bc2b9699a962c3f280b82..e13ca33f6fc5fcb2cff17aa6d872085717b8c387 100755 (executable)
@@ -12,13 +12,13 @@ for entry in chromiumos.gen_autosuspend_rules.PCI_IDS:
     vendor, device = entry.split(':')
     vendor = int(vendor, 16)
     device = int(device, 16)
-    print(f'pci:v{vendor:08X}d{device:08X}*')
+    print('pci:v{:08X}d{:08X}*'.format(vendor, device))
 
 print('# usb:v<VEND>p<PROD> (4 uppercase hexadecimal digits twice')
 for entry in chromiumos.gen_autosuspend_rules.USB_IDS:
     vendor, product = entry.split(':')
     vendor = int(vendor, 16)
     product = int(product, 16)
-    print(f'usb:v{vendor:04X}p{product:04X}*')
+    print('usb:v{:04X}p{:04X}*'.format(vendor, product))
 
 print(' ID_AUTOSUSPEND=1')