Fridrich Strba 2023-08-09 05:54:26 +00:00 committed by Git OBS Bridge
parent ccd3752e2b
commit e7b7748277
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 9 05:53:27 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Do not format using f-strings, since it is python 3.6+ feature
and SLE12-SP5 has python 3.4
-------------------------------------------------------------------
Thu Mar 16 07:30:43 UTC 2023 - Martin Liška <mliska@suse.cz>

View File

@ -52,7 +52,7 @@ for libdir in LIBDIRS:
# we have to be sure it is not owned by anything else
# doing in 2nd run to ensure avoiding collisions
if link.is_dir() and not any(link.iterdir()):
r = subprocess.run(f'rpm -qf {file}', shell=True,
r = subprocess.run("rpm -qf {}".format(file), shell=True,
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
if not r.stdout:
link.rmdir()
@ -76,8 +76,8 @@ for libdir in LIBDIRS:
if leftover.is_dir() and not any(leftover.iterdir()):
leftover.rmdir()
# remove dangling links as they might happen when migratin from older
# remove dangling links as they might happen when migrating from older
# libreoffice versions
# Run find directly as it's faster than os.walk run and a os.path.islink!
subprocess.run(f'find {str(lodir)} -type l -xtype l -delete',
subprocess.run("find {} -type l -xtype l -delete".format(str(lodir)),
shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)