add some more context to error messages

[Emilgardis]

No description provided.

[Emilgardis]

this is targeted towards #273.

@schrieveslaach could you install this fork/rev and try if it spits out a more helpful error message. The binary will be available in artifacts soon.

bors try --target x86_64-unknown-linux-gnu

[bors]

try

Build succeeded:

• conclusion

[Emilgardis]

https://github.com/cross-rs/cross/suites/7158924821/artifacts/28501590

download: cross-x86_64-unknown-linux-gnu.zip

[schrieveslaach]

@Emilgardis, here are the results.

[Emilgardis]

Awesome, thats a huge help, that file seems to be a symlink, so we're basically not handling that correctly

[Alexhuszagh]

Awesome, thats a huge help, that file seems to be a symlink, so we're basically not handling that correctly

Ah I definitely didn't handle them for copying the toolchains, it might have slipped through to ordinary files. It should handle copying entire directories which contain symlinks fine, however.

[Alexhuszagh]

We should probably also add a warning if generating the symlinks fails, like if this subcommand fails. It should probably say something like .wrap_err("when creating symlinks to provide consistent host/mount paths");

cross/src/docker/remote.rs

Lines 955 to 982 in e583132

	symlink.push(format!(
	"prefix=\"{mount_prefix}\"
	symlink_recurse() {{
	for f in \"${{1}}\"/*; do
	dst=${{f#\"$prefix\"}}
	if [ -f \"${{dst}}\" ]; then
	echo \"invalid: got unexpected file at ${{dst}}\" 1>&2
	exit 1
	elif [ -d \"${{dst}}\" ]; then
	symlink_recurse \"${{f}}\"
	else
	ln -s \"${{f}}\" \"${{dst}}\"
	fi
	done
	}}
	symlink_recurse \"${{prefix}}\"
	"
	));
	for (src, dst) in to_symlink {
	symlink.push(format!("ln -s \"{}\" \"{}\"", src.as_posix()?, dst));
	}
	subcommand(engine, "exec")
	.arg(&container)
	.args(&["sh", "-c", &symlink.join("\n")])
	.run_and_get_status(msg_info, false)
	.map_err::<eyre::ErrReport, _>(Into::into)?;

[Emilgardis]

It should handle copying entire directories which contain symlinks fine, however.

The issue is this I believe.

cross/src/docker/remote.rs

Lines 247 to 254 in e583132

	let src_path = file.path();
	let dst_path = dst.join(file.file_name());
	if file.file_type()?.is_file() {
	fs::copy(&src_path, &dst_path)?;
	} else {
	fs::create_dir(&dst_path).ok();
	copy_dir(&src_path, &dst_path, depth + 1, skip)?;
	}

is_file == false for symlinks

[Alexhuszagh]

is_file == false for symlinks

That should be it. I'll submit a fix shortly. I did that intentionally for toolchains, but I also mistakenly applied that for projects and other mounted volumes. EDIT: Implemented in #885.

[Alexhuszagh]

Once this is implemented, it's good to go:

We should probably also add a warning if generating the symlinks fails, like if this subcommand fails. It should probably say something like .wrap_err("when creating symlinks to provide consistent host/mount paths");

cross/src/docker/remote.rs

Lines 955 to 982 in e583132

	symlink.push(format!(
	"prefix=\"{mount_prefix}\"
	symlink_recurse() {{
	for f in \"${{1}}\"/*; do
	dst=${{f#\"$prefix\"}}
	if [ -f \"${{dst}}\" ]; then
	echo \"invalid: got unexpected file at ${{dst}}\" 1>&2
	exit 1
	elif [ -d \"${{dst}}\" ]; then
	symlink_recurse \"${{f}}\"
	else
	ln -s \"${{f}}\" \"${{dst}}\"
	fi
	done
	}}
	symlink_recurse \"${{prefix}}\"
	"
	));
	for (src, dst) in to_symlink {
	symlink.push(format!("ln -s \"{}\" \"{}\"", src.as_posix()?, dst));
	}
	subcommand(engine, "exec")
	.arg(&container)
	.args(&["sh", "-c", &symlink.join("\n")])
	.run_and_get_status(msg_info, false)
	.map_err::<eyre::ErrReport, _>(Into::into)?;

[Alexhuszagh]

bors r+

[bors]

Build succeeded:

• conclusion