Skip to content
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.

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

Better error if PathSource::walk can't access something. #6841

Merged
merged 1 commit into from
Apr 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/cargo/sources/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ use log::{trace, warn};
use crate::core::source::MaybePackage;
use crate::core::{Dependency, Package, PackageId, Source, SourceId, Summary};
use crate::ops;
use crate::util::paths;
use crate::util::Config;
use crate::util::{internal, CargoResult};
use crate::util::{internal, paths, CargoResult, CargoResultExt, Config};

pub struct PathSource<'cfg> {
source_id: SourceId,
Expand Down Expand Up @@ -455,7 +453,10 @@ impl<'cfg> PathSource<'cfg> {
//
// TODO: drop `collect` and sort after transition period and dropping warning tests.
// See rust-lang/cargo#4268 and rust-lang/cargo#4270.
let mut entries: Vec<PathBuf> = fs::read_dir(path)?.map(|e| e.unwrap().path()).collect();
let mut entries: Vec<PathBuf> = fs::read_dir(path)
.chain_err(|| format!("cannot read {:?}", path))?
.map(|e| e.unwrap().path())
.collect();
entries.sort_unstable_by(|a, b| a.as_os_str().cmp(b.as_os_str()));
for path in entries {
let name = path.file_name().and_then(|s| s.to_str());
Expand Down
33 changes: 30 additions & 3 deletions tests/testsuite/build_script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3720,9 +3720,7 @@ fn using_rerun_if_changed_does_not_rebuild() {
.build();

p.cargo("build").run();
p.cargo("build")
.with_stderr("[FINISHED] [..]")
.run();
p.cargo("build").with_stderr("[FINISHED] [..]").run();
}

#[test]
Expand Down Expand Up @@ -3807,3 +3805,32 @@ fn links_interrupted_can_restart() {
.with_stderr_contains("[RUNNING] [..]/foo-[..]/build-script-build[..]")
.run();
}

#[test]
#[cfg(unix)]
fn build_script_scan_eacces() {
// build.rs causes a scan of the whole project, which can be a problem if
// a directory is not accessible.
use std::os::unix::fs::PermissionsExt;
let p = project()
.file("src/lib.rs", "")
.file("build.rs", "fn main() {}")
.file("secrets/stuff", "")
.build();
let path = p.root().join("secrets");
fs::set_permissions(&path, fs::Permissions::from_mode(0)).unwrap();
// "Caused by" is a string from libc such as the following:
// Permission denied (os error 13)
p.cargo("build")
.with_stderr(
"\
[ERROR] cannot read \"[..]/foo/secrets\"

Caused by:
[..]
",
)
.with_status(101)
.run();
fs::set_permissions(&path, fs::Permissions::from_mode(0o755)).unwrap();
}