Skip to content

work around mock (COPR) regression #1693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −5
Open

work around mock (COPR) regression #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa155a
ostree-ext: Add .context for some more errors
cgwalters Oct 19, 2025
33bdd01
build-sys/rpm: Disable unit tests if we detect we're in seccomp
cgwalters Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion contrib/packaging/bootc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ find %{?buildroot}/%{_docdir} ! -type d -printf '%{_docdir}/%%P\n' > bootcdoclis

%if %{with check}
%check
%cargo_test
if grep -qEe 'Seccomp:.*0$' /proc/self/status; then
%cargo_test
else
echo "skipping unit tests due to https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652"
fi
%endif

%files -f bootcdoclist.txt
Expand Down
20 changes: 16 additions & 4 deletions crates/ostree-ext/src/globals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
//! Module containing access to global state.

use super::Result;
use anyhow::Context;
use camino::{Utf8Path, Utf8PathBuf};
use cap_std_ext::cap_std::fs::Dir;
use cap_std_ext::RootDir;
use fn_error_context::context;
use ostree::glib;
use std::fs::File;
use std::sync::OnceLock;
Expand Down Expand Up @@ -61,17 +63,26 @@ impl ConfigPaths {
let p = p.as_ref();
let mut runtime = self.runtime.clone();
runtime.push(p);
if let Some(f) = root.open_optional(&runtime)? {
if let Some(f) = root
.open_optional(&runtime)
.context("Opening runtime auth file")?
{
return Ok(Some((runtime, f)));
}
let mut persistent = self.persistent.clone();
persistent.push(p);
if let Some(f) = root.open_optional(&persistent)? {
if let Some(f) = root
.open_optional(&persistent)
.context("Opening persistent auth file")?
{
return Ok(Some((persistent, f)));
}
if let Some(mut system) = self.system.clone() {
system.push(p);
if let Some(f) = root.open_optional(&system)? {
if let Some(f) = root
.open_optional(&system)
.context("Opening system auth file")?
{
return Ok(Some((system, f)));
}
}
Expand All @@ -80,8 +91,9 @@ impl ConfigPaths {
}

/// Return the path to the global container authentication file, if it exists.
#[context("Loading global authfile")]
pub fn get_global_authfile(root: &Dir) -> Result<Option<(Utf8PathBuf, File)>> {
let root = &RootDir::new(root, ".")?;
let root = &RootDir::new(root, ".").context("Opening RootDir")?;
let am_uid0 = rustix::process::getuid() == rustix::process::Uid::ROOT;
get_global_authfile_impl(root, am_uid0)
}
Expand Down