keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extensions: Don't try to chown RPM packages

Browse Source 
We don't need it and it won't work in the unprivileged path where we're
running this in a cosa supermin (of course, this is all a bit silly
because we don't actually need privileges to begin with for this, but
there's a lot of momentum in sticking with that workflow).

Update submodule: libglnx
This commit is contained in:
Jonathan Lebon 2021-02-09 16:32:20 -05:00 committed by OpenShift Merge Robot
parent e7c744e8b2
commit 56f95cc5c1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit 900caea698690b18db4f2a9cd2c3abb4f84f10b5 Subproject commit 4c9055ac08bb64dca146724f488cce4c1ce4c628

6
src/app/rpmostree-compose-builtin-tree.cxx
View File

@ -1617,8 +1617,9 @@ rpmostree_compose_builtin_extensions (int argc,
DnfPackage *pkg = (DnfPackage*)extensions_pkgs->pdata[i]; DnfPackage *pkg = (DnfPackage*)extensions_pkgs->pdata[i];
const char *src = dnf_package_get_filename (pkg); const char *src = dnf_package_get_filename (pkg);
const char *basename = glnx_basename (src); const char *basename = glnx_basename (src);
GLnxFileCopyFlags flags = static_cast<GLnxFileCopyFlags>(GLNX_FILE_COPY_NOXATTRS | GLNX_FILE_COPY_NOCHOWN);
if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd, if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd,
basename, GLNX_FILE_COPY_NOXATTRS, cancellable, error)) basename, flags, cancellable, error))
return FALSE; return FALSE;
} }
@ -1654,8 +1655,9 @@ rpmostree_compose_builtin_extensions (int argc,
DnfPackage *pkg = (DnfPackage*)devel_pkgs_to_download->pdata[i]; DnfPackage *pkg = (DnfPackage*)devel_pkgs_to_download->pdata[i];
const char *src = dnf_package_get_filename (pkg); const char *src = dnf_package_get_filename (pkg);
const char *basename = glnx_basename (src); const char *basename = glnx_basename (src);
GLnxFileCopyFlags flags = static_cast<GLnxFileCopyFlags>(GLNX_FILE_COPY_NOXATTRS | GLNX_FILE_COPY_NOCHOWN);
if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd, if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd,
basename, GLNX_FILE_COPY_NOXATTRS, cancellable, error)) basename, flags, cancellable, error))
return FALSE; return FALSE;
} }