style: cargo fmt for v1.7.99-alpha release gate
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
144c4a2872
commit
83bb589ea6
@@ -281,9 +281,15 @@ async fn fetch_one(client: &reqwest::Client, url: &str) -> anyhow::Result<AppCat
|
||||
crate::trust::SignatureStatus::Unsigned => {
|
||||
debug!("app-catalog: unsigned (accepted during migration window)");
|
||||
}
|
||||
crate::trust::SignatureStatus::Verified { signer_did, anchored } => {
|
||||
crate::trust::SignatureStatus::Verified {
|
||||
signer_did,
|
||||
anchored,
|
||||
} => {
|
||||
if anchored {
|
||||
info!("app-catalog: release-root signature verified ({})", signer_did);
|
||||
info!(
|
||||
"app-catalog: release-root signature verified ({})",
|
||||
signer_did
|
||||
);
|
||||
} else {
|
||||
warn!(
|
||||
"app-catalog: signature self-consistent but release-root anchor \
|
||||
|
||||
@@ -235,7 +235,9 @@ fn build_fingerprint_stamp_path(data_dir: &Path, tag: &str) -> PathBuf {
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() { c } else { '_' })
|
||||
.collect();
|
||||
data_dir.join(".image-build").join(format!("{safe}.fingerprint"))
|
||||
data_dir
|
||||
.join(".image-build")
|
||||
.join(format!("{safe}.fingerprint"))
|
||||
}
|
||||
|
||||
async fn chown_for_rootless_container(uid_gid: &str, path: &str) -> Result<()> {
|
||||
@@ -362,7 +364,16 @@ async fn ensure_running_container_ownership(name: &str) -> bool {
|
||||
|
||||
// Repair inside the container's userns — podman maps to the right host uid.
|
||||
let chown = tokio::process::Command::new("podman")
|
||||
.args(["exec", "-u", "0", name, "chown", "-R", &format!("{uid}:{gid}"), dest])
|
||||
.args([
|
||||
"exec",
|
||||
"-u",
|
||||
"0",
|
||||
name,
|
||||
"chown",
|
||||
"-R",
|
||||
&format!("{uid}:{gid}"),
|
||||
dest,
|
||||
])
|
||||
.output()
|
||||
.await;
|
||||
match chown {
|
||||
@@ -378,7 +389,9 @@ async fn ensure_running_container_ownership(name: &str) -> bool {
|
||||
"volume ownership repair failed: {}",
|
||||
String::from_utf8_lossy(&o.stderr).trim()
|
||||
),
|
||||
Err(e) => tracing::warn!(container = %name, dest, "volume ownership repair errored: {e}"),
|
||||
Err(e) => {
|
||||
tracing::warn!(container = %name, dest, "volume ownership repair errored: {e}")
|
||||
}
|
||||
}
|
||||
}
|
||||
repaired
|
||||
@@ -4634,10 +4647,15 @@ app:
|
||||
|
||||
#[test]
|
||||
fn build_fingerprint_stamp_path_sanitizes_tag() {
|
||||
let p = build_fingerprint_stamp_path(Path::new("/var/lib/archipelago"), "localhost/bitcoin-ui:local");
|
||||
let p = build_fingerprint_stamp_path(
|
||||
Path::new("/var/lib/archipelago"),
|
||||
"localhost/bitcoin-ui:local",
|
||||
);
|
||||
assert_eq!(
|
||||
p,
|
||||
PathBuf::from("/var/lib/archipelago/.image-build/localhost_bitcoin_ui_local.fingerprint")
|
||||
PathBuf::from(
|
||||
"/var/lib/archipelago/.image-build/localhost_bitcoin_ui_local.fingerprint"
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user