| |
@@ -10,6 +10,7 @@
|
| |
<%
|
| |
import os
|
| |
import re
|
| |
+ import tempfile
|
| |
from pylorax.executils import runcmd_output, setenv
|
| |
from pylorax.sysutils import joinpaths
|
| |
|
| |
@@ -20,10 +21,13 @@
|
| |
flatpak_dir=joinpaths(os.path.dirname(root), "flatpak")
|
| |
setenv("FLATPAK_USER_DIR", flatpak_dir)
|
| |
flatpak_repo=joinpaths(flatpak_dir, "repo")
|
| |
+ # suppress executing triggers by using an empty directory
|
| |
+ triggers_dir = tempfile.mkdtemp(prefix='flatpak-triggers-')
|
| |
+ setenv("FLATPAK_TRIGGERSDIR", triggers_dir)
|
| |
%>
|
| |
|
| |
runcmd flatpak config --user --set languages "*"
|
| |
- runcmd flatpak remote-add --user ${flatpak_remote_name} oci+https://registry.fedoraproject.org
|
| |
+ runcmd flatpak remote-add --user ${flatpak_remote_name} ${flatpak_remote_url}
|
| |
runcmd flatpak install -y --user ${flatpak_remote_name} ${flatpak_remote_refs}
|
| |
runcmd mkdir -p ${root}/flatpak
|
| |
runcmd ostree init --repo=${dest_repo} --mode=archive-z2
|
| |
otaylor
commented 4 years ago
This pull request fast-forwards the f31 branch to master, picking up two fixes for
lorax-embed-flatpaks.tmpl- with these fixes this functionality is now testing correctly on rawhide, both at compose time and at install time.