Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b9eedea4
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b9eedea4
编写于
5月 26, 2022
作者:
J
Joshua Nelson
提交者:
Joshua Nelson
6月 19, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Panic if `dist` generates a symbolic link in a generated tarball
This avoids regressions in rustup-toolchain-install-master
上级
532be942
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
2 deletion
+27
-2
Cargo.lock
Cargo.lock
+1
-0
src/bootstrap/Cargo.toml
src/bootstrap/Cargo.toml
+1
-0
src/bootstrap/dist.rs
src/bootstrap/dist.rs
+6
-1
src/bootstrap/tarball.rs
src/bootstrap/tarball.rs
+19
-1
未找到文件。
Cargo.lock
浏览文件 @
b9eedea4
...
...
@@ -225,6 +225,7 @@ dependencies = [
"serde_json",
"tar",
"toml",
"walkdir",
"winapi",
"xz2",
]
...
...
src/bootstrap/Cargo.toml
浏览文件 @
b9eedea4
...
...
@@ -48,6 +48,7 @@ ignore = "0.4.10"
opener
=
"0.5"
once_cell
=
"1.7.2"
xz2
=
"0.1"
walkdir
=
"2"
[target.'cfg(windows)'.dependencies.winapi]
version
=
"0.3"
...
...
src/bootstrap/dist.rs
浏览文件 @
b9eedea4
...
...
@@ -848,7 +848,12 @@ fn make_run(run: RunConfig<'_>) {
/// Creates the plain source tarball
fn
run
(
self
,
builder
:
&
Builder
<
'_
>
)
->
GeneratedTarball
{
let
tarball
=
Tarball
::
new
(
builder
,
"rustc"
,
"src"
);
// NOTE: This is a strange component in a lot of ways. It uses `src` as the target, which
// means neither rustup nor rustup-toolchain-install-master know how to download it.
// It also contains symbolic links, unlike other any other dist tarball.
// It's used for distros building rustc from source in a pre-vendored environment.
let
mut
tarball
=
Tarball
::
new
(
builder
,
"rustc"
,
"src"
);
tarball
.permit_symlinks
(
true
);
let
plain_dst_src
=
tarball
.image_dir
();
// This is the set of root paths which will become part of the source package
...
...
src/bootstrap/tarball.rs
浏览文件 @
b9eedea4
...
...
@@ -102,6 +102,7 @@ pub(crate) struct Tarball<'a> {
include_target_in_component_name
:
bool
,
is_preview
:
bool
,
permit_symlinks
:
bool
,
}
impl
<
'a
>
Tarball
<
'a
>
{
...
...
@@ -141,6 +142,7 @@ fn new_inner(builder: &'a Builder<'a>, component: &str, target: Option<String>)
include_target_in_component_name
:
false
,
is_preview
:
false
,
permit_symlinks
:
false
,
}
}
...
...
@@ -160,6 +162,10 @@ pub(crate) fn is_preview(&mut self, is: bool) {
self
.is_preview
=
is
;
}
pub
(
crate
)
fn
permit_symlinks
(
&
mut
self
,
flag
:
bool
)
{
self
.permit_symlinks
=
flag
;
}
pub
(
crate
)
fn
image_dir
(
&
self
)
->
&
Path
{
t!
(
std
::
fs
::
create_dir_all
(
&
self
.image_dir
));
&
self
.image_dir
...
...
@@ -316,6 +322,18 @@ fn run(self, build_cli: impl FnOnce(&Tarball<'a>, &mut Command)) -> GeneratedTar
}
self
.builder
.run
(
&
mut
cmd
);
// Ensure there are no symbolic links in the tarball. In particular,
// rustup-toolchain-install-master and most versions of Windows can't handle symbolic links.
let
decompressed_output
=
self
.temp_dir
.join
(
&
package_name
);
if
!
self
.builder.config.dry_run
&&
!
self
.permit_symlinks
{
for
entry
in
walkdir
::
WalkDir
::
new
(
&
decompressed_output
)
{
let
entry
=
t!
(
entry
);
if
entry
.path_is_symlink
()
{
panic!
(
"generated a symlink in a tarball: {}"
,
entry
.path
()
.display
());
}
}
}
// Use either the first compression format defined, or "gz" as the default.
let
ext
=
self
.builder
...
...
@@ -328,7 +346,7 @@ fn run(self, build_cli: impl FnOnce(&Tarball<'a>, &mut Command)) -> GeneratedTar
GeneratedTarball
{
path
:
crate
::
dist
::
distdir
(
self
.builder
)
.join
(
format!
(
"{}.tar.{}"
,
package_name
,
ext
)),
decompressed_output
:
self
.temp_dir
.join
(
package_name
)
,
decompressed_output
,
work
:
self
.temp_dir
,
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录