almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

dev_scripts: Download FPF's PySide6 RPM only for Fedora 39

Browse source 
Download the FPF-maintained python3-pyside6 RPM [1] only when we build
an end-user environment for Fedora 39. Else, from Fedora 40 onwards, we
can use the official `python3-pyside6` RPM.

Refs freedomofpress/maint-dangerzone-pyside6#5

[1]: https://packages.freedom.press/yum-tools-prod/dangerzone/f39/python3-pyside6-6.7.1-1.fc39.x86_64.rpm
This commit is contained in:
Alex Pyrgiotis 2024-07-16 20:03:38 +03:00
parent 168f0e53a8
commit f739761405
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dev_scripts/env.py
View file

@ -638,26 +638,27 @@ class Env:
package_dst = build_dir / package package_dst = build_dir / package
install_cmd = "dnf install -y" install_cmd = "dnf install -y"
# NOTE: For Fedora 39+ onward, we check if a PySide6 RPM package exists in # NOTE: For Fedora 39, we check if a PySide6 RPM package exists in
# the user's system. If not, we either throw an error or download it from # the user's system. If not, we either throw an error or download it from
# FPF's repo, according to the user's choice. # FPF's repo, according to the user's choice.
pyside6 = PySide6Manager(self.distro, self.version) if self.version == "39":
if not pyside6.is_rpm_present: pyside6 = PySide6Manager(self.distro, self.version)
if download_pyside6: if not pyside6.is_rpm_present:
pyside6.download_rpm() if download_pyside6:
else: pyside6.download_rpm()
print( else:
PYSIDE6_NOT_FOUND_ERROR.format( print(
pyside6_local_path=pyside6.rpm_local_path, PYSIDE6_NOT_FOUND_ERROR.format(
pyside6_url=pyside6.rpm_url, pyside6_local_path=pyside6.rpm_local_path,
), pyside6_url=pyside6.rpm_url,
file=sys.stderr, ),
) file=sys.stderr,
return 1 )
shutil.copy(pyside6.rpm_local_path, build_dir / pyside6.rpm_name) return 1
install_deps = ( shutil.copy(pyside6.rpm_local_path, build_dir / pyside6.rpm_name)
DOCKERFILE_BUILD_FEDORA_DEPS + DOCKERFILE_BUILD_FEDORA_39_DEPS install_deps = (
).format(pyside6_rpm=pyside6.rpm_name) DOCKERFILE_BUILD_FEDORA_DEPS + DOCKERFILE_BUILD_FEDORA_39_DEPS
).format(pyside6_rpm=pyside6.rpm_name)
else: else:
install_deps = DOCKERFILE_BUILD_DEBIAN_DEPS install_deps = DOCKERFILE_BUILD_DEBIAN_DEPS
if self.distro == "ubuntu" and self.version in ("20.04", "focal"): if self.distro == "ubuntu" and self.version in ("20.04", "focal"):