39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 15bb7c8d531c24a144c1b7e3f85322ebf4f25be6 Mon Sep 17 00:00:00 2001
|
|
From: Colin Walters <walters@verbum.org>
|
|
Date: Mon, 26 Jun 2023 05:17:45 -0400
|
|
Subject: [PATCH] Revert "fetcher: Always open tmpfiles in repo location"
|
|
|
|
This reverts commit f7f6f87c513c9f35bc24f35e909779c19cb49d3a.
|
|
|
|
This seems to have broken flatpak, so we'll revert and then
|
|
investigate.
|
|
|
|
Closes: https://github.com/ostreedev/ostree/issues/2900
|
|
---
|
|
src/libostree/ostree-fetcher-util.h | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libostree/ostree-fetcher-util.h b/src/libostree/ostree-fetcher-util.h
|
|
index 35f3e854..c3243801 100644
|
|
--- a/src/libostree/ostree-fetcher-util.h
|
|
+++ b/src/libostree/ostree-fetcher-util.h
|
|
@@ -35,8 +35,14 @@ static inline gboolean
|
|
_ostree_fetcher_tmpf_from_flags (OstreeFetcherRequestFlags flags, int dfd, GLnxTmpfile *tmpf,
|
|
GError **error)
|
|
{
|
|
- if (!glnx_open_tmpfile_linkable_at (dfd, ".", O_RDWR | O_CLOEXEC, tmpf, error))
|
|
+ if ((flags & OSTREE_FETCHER_REQUEST_LINKABLE) > 0)
|
|
+ {
|
|
+ if (!glnx_open_tmpfile_linkable_at (dfd, ".", O_RDWR | O_CLOEXEC, tmpf, error))
|
|
+ return FALSE;
|
|
+ }
|
|
+ else if (!glnx_open_anonymous_tmpfile (O_RDWR | O_CLOEXEC, tmpf, error))
|
|
return FALSE;
|
|
+
|
|
if (!glnx_fchmod (tmpf->fd, 0644, error))
|
|
return FALSE;
|
|
return TRUE;
|
|
--
|
|
2.41.0
|
|
|