diff options
| -rw-r--r-- | cmdline/apt-key.in | 2 | ||||
| -rwxr-xr-x | test/integration/run-tests | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 3c2e2663f..790859e26 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -220,7 +220,7 @@ foreach_keyring_do() { if [ "${STRIPPED_TRUSTEDPARTS}/" = "$TRUSTEDPARTS" ]; then TRUSTEDPARTS="$STRIPPED_TRUSTEDPARTS" fi - for trusted in $(run-parts --list "$TRUSTEDPARTS" --regex '^.*\.gpg$'); do + for trusted in $(find "$TRUSTEDPARTS" -mindepth 1 -maxdepth 1 -regex '^.*\.gpg$' | sort); do if [ -s "$trusted" ]; then $ACTION "$trusted" "$@" fi diff --git a/test/integration/run-tests b/test/integration/run-tests index f2a266139..89c3a10e7 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -83,7 +83,7 @@ PASS=0 ALL=0 FAILED_TESTS="" DIR="$(readlink -f "$(dirname "$0")")" -TESTLIST="$(run-parts --list "$DIR" --regex '^test-.*$')" +TESTLIST="$(find "$DIR" -mindepth 1 -maxdepth 1 -regex '^.*/test-[^/]*$' | sort)" if [ -n "$APT_TEST_JOBS" ]; then if [ "$MSGCOLOR" != 'NO' ]; then export MSGCOLOR='ALWAYS' |