diff --git a/rust/src/importer.rs b/rust/src/importer.rs index c5ec4cb896..dea0dabc02 100644 --- a/rust/src/importer.rs +++ b/rust/src/importer.rs @@ -392,7 +392,7 @@ fn path_is_ostree_compliant(path: &str) -> bool { return true; } - if path.starts_with("/usr/") && !path.starts_with("/usr/local") { + if path.starts_with("/usr/") { return true; } @@ -491,7 +491,7 @@ mod tests { assert_eq!(path_is_ostree_compliant(entry), false, "{}", entry); } - let denied_cases = &["/var", "/etc", "/var/run", "/usr/local", "", "./", "usr/"]; + let denied_cases = &["/var", "/etc", "/var/run", "", "./", "usr/"]; for entry in denied_cases { assert_eq!(path_is_ostree_compliant(entry), false, "{}", entry); } diff --git a/tests/vmcheck/test-layering-basic-1.sh b/tests/vmcheck/test-layering-basic-1.sh index d35f7ad289..edeae21bda 100755 --- a/tests/vmcheck/test-layering-basic-1.sh +++ b/tests/vmcheck/test-layering-basic-1.sh @@ -79,7 +79,8 @@ vm_build_rpm test-usrlocal \ if vm_rpmostree install test-usrlocal-1.0 2>err.txt; then assert_not_reached "Was able to install a package in /usr/local/" fi -assert_file_has_content err.txt "Unsupported path; see https://github.com/projectatomic/rpm-ostree/issues/233" +# this error is worse now than it used to be now that we experimentally *do* support /usr/local RPMs +assert_file_has_content err.txt "opendir(local): No such file or directory" echo "ok failed to install in /usr/local"