d/p/Don-t-write-to-parent-repo.patch: Drop, applied upstream
This commit is contained in:
parent
ece7b1c3e0
commit
b4b2ce459d
|
|
@ -5,6 +5,7 @@ ostree (2018.5-1) UNRELEASED; urgency=medium
|
||||||
GFDL-1.3-or-later, and doc/ isn't included in dist tarballs, so
|
GFDL-1.3-or-later, and doc/ isn't included in dist tarballs, so
|
||||||
remove those licenses
|
remove those licenses
|
||||||
- d/libostree-1-1.symbols: Update (and sort)
|
- d/libostree-1-1.symbols: Update (and sort)
|
||||||
|
- d/p/Don-t-write-to-parent-repo.patch: Drop, applied upstream
|
||||||
* ostree-tests: Add Lintian override for library-not-linked-against-libc.
|
* ostree-tests: Add Lintian override for library-not-linked-against-libc.
|
||||||
libreaddir-rand.so genuinely doesn't use any libc ABIs directly, only
|
libreaddir-rand.so genuinely doesn't use any libc ABIs directly, only
|
||||||
via GLib.
|
via GLib.
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
From: Alexander Larsson <alexl@redhat.com>
|
|
||||||
Date: Thu, 29 Mar 2018 15:19:33 +0200
|
|
||||||
Subject: Don't write to parent repo
|
|
||||||
|
|
||||||
In _try_clone_from_payload_link, don't try to do the clone in the
|
|
||||||
parent repo, because we don't want to modify that. parent repos are
|
|
||||||
typically used when you want a shared, immutable base.
|
|
||||||
|
|
||||||
For example in flatpak, the parent repo is the system repo which you
|
|
||||||
don't have write access to, so any modification to it will fail with
|
|
||||||
EACCES, making it impossible to install via the system helper.
|
|
||||||
|
|
||||||
Closes: #1524
|
|
||||||
Approved by: cgwalters
|
|
||||||
Applied-upstream: 2018.5, commit:28c7bc6d0e153a0b07bdb82d25473a490765067f
|
|
||||||
---
|
|
||||||
src/libostree/ostree-repo-commit.c | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
|
|
||||||
index 16081a9..98b03e6 100644
|
|
||||||
--- a/src/libostree/ostree-repo-commit.c
|
|
||||||
+++ b/src/libostree/ostree-repo-commit.c
|
|
||||||
@@ -777,8 +777,6 @@ _try_clone_from_payload_link (OstreeRepo *self,
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- if (self->parent_repo)
|
|
||||||
- return _try_clone_from_payload_link (self->parent_repo, payload_checksum, file_info, tmpf, cancellable, error);
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Don-t-write-to-parent-repo.patch
|
|
||||||
Loading…
Reference in New Issue