Skip to content

Commit 57ab06a

Browse files
authored
Merge branch 'uutils:main' into tsort_compatibility
2 parents 399464a + 7f4d902 commit 57ab06a

File tree

12 files changed

+186
-213
lines changed

12 files changed

+186
-213
lines changed

.github/workflows/CICD.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,7 @@ jobs:
273273
target: aarch64-unknown-linux-gnu
274274
- uses: taiki-e/install-action@nextest
275275
- uses: Swatinem/rust-cache@v2
276-
- name: Install/setup prerequisites
277-
shell: bash
278-
run: |
279-
sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
276+
# Test build on the system missing libselinux (don't install libselinux1-dev at here)
280277
- name: Run sccache-cache
281278
uses: mozilla-actions/sccache-action@v0.0.9
282279
- name: "`make build`"
@@ -1202,6 +1199,7 @@ jobs:
12021199
- name: build and test all features individually
12031200
shell: bash
12041201
run: |
1202+
command -v sudo && sudo rm -rf /usr/share/dotnet # avoid no space left
12051203
CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
12061204
for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
12071205
do

Cargo.lock

Lines changed: 17 additions & 144 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -587,17 +587,13 @@ name = "uudoc"
587587
path = "src/bin/uudoc.rs"
588588
required-features = ["uudoc"]
589589

590-
# The default release profile. It contains all optimizations.
591-
# With this profile (like in the standard release profile),
592-
# the stack traces will still be available.
590+
# The default release profile with some optimizations.
593591
[profile.release]
594592
lto = true
593+
panic = "abort"
595594

596-
# A release-like profile that is tuned to be fast, even when being fast
597-
# compromises on binary size. This includes aborting on panic.
598595
[profile.release-fast]
599596
inherits = "release"
600-
panic = "abort"
601597
codegen-units = 1
602598

603599
# A release-like profile that is as small as possible.
@@ -606,10 +602,11 @@ inherits = "release-fast"
606602
opt-level = "z"
607603
strip = true
608604

609-
# A release-like profile with debug info, useful for profiling.
605+
# A release-like profile with debug info for profiling.
610606
# See https://github.com/mstange/samply .
611607
[profile.profiling]
612608
inherits = "release"
609+
panic = "unwind"
613610
debug = true
614611

615612
[lints]

GNUmakefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,11 @@ HASHSUM_PROGS := \
195195

196196
$(info Detected OS = $(OS))
197197

198-
# Build the SELinux programs only on Linux
199-
ifeq ($(filter $(OS),Linux),)
200-
SELINUX_PROGS :=
201-
endif
202-
203198
ifneq ($(OS),Windows_NT)
204-
PROGS := $(PROGS) $(UNIX_PROGS)
205-
# Build the selinux command even if not on the system
206-
PROGS := $(PROGS) $(SELINUX_PROGS)
199+
PROGS += $(UNIX_PROGS)
200+
endif
201+
ifeq ($(SELINUX_ENABLED),1)
202+
PROGS += $(SELINUX_PROGS)
207203
endif
208204

209205
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
@@ -337,7 +333,7 @@ test:
337333
${CARGO} test ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" $(PROFILE_CMD) --no-default-features $(TEST_NO_FAIL_FAST)
338334

339335
nextest:
340-
${CARGO} nextest run ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" --no-default-features $(TEST_NO_FAIL_FAST)
336+
${CARGO} nextest run ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" $(PROFILE_CMD) --no-default-features $(TEST_NO_FAIL_FAST)
341337

342338
test_toybox:
343339
-(cd $(TOYBOX_SRC)/ && make tests)

src/uu/install/src/install.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use uucore::display::Quotable;
2525
use uucore::entries::{grp2gid, usr2uid};
2626
use uucore::error::{FromIo, UError, UResult, UUsageError};
2727
use uucore::fs::dir_strip_dot_for_creation;
28-
use uucore::mode::get_umask;
2928
use uucore::perms::{Verbosity, VerbosityLevel, wrap_chown};
3029
use uucore::process::{getegid, geteuid};
3130
#[cfg(feature = "selinux")]
@@ -339,7 +338,7 @@ fn behavior(matches: &ArgMatches) -> UResult<Behavior> {
339338

340339
let specified_mode: Option<u32> = if matches.contains_id(OPT_MODE) {
341340
let x = matches.get_one::<String>(OPT_MODE).ok_or(1)?;
342-
Some(mode::parse(x, considering_dir, get_umask()).map_err(|err| {
341+
Some(mode::parse(x, considering_dir, 0).map_err(|err| {
343342
show_error!(
344343
"{}",
345344
translate!("install-error-invalid-mode", "error" => err)

0 commit comments

Comments
 (0)