shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge f10cbd100c into 8aaea0c65d

Browse Source
This commit is contained in:
Tomasz Kłoczko 2024-12-20 15:45:25 +01:00 committed by GitHub
commit 526f9bd991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/libtest.sh
View File

@ -107,7 +107,7 @@ export TEST_GPG_KEYHOME=${test_tmpdir}/gpghome
export OSTREE_GPG_HOME=${test_tmpdir}/gpghome/trusted export OSTREE_GPG_HOME=${test_tmpdir}/gpghome/trusted
assert_has_setfattr() { assert_has_setfattr() {
if ! which setfattr 2>/dev/null; then if ! command -v setfattr 2>/dev/null; then
fatal "no setfattr available to determine xattr support" fatal "no setfattr available to determine xattr support"
fi fi
} }
@ -727,9 +727,9 @@ which_gpg () {
local opt local opt
# Prefer gpg2 in case gpg refers to gpg1 # Prefer gpg2 in case gpg refers to gpg1
if which gpg2 &>/dev/null; then if command -v gpg2 &>/dev/null; then
gpg=gpg2 gpg=gpg2
elif which gpg &>/dev/null; then elif command -v gpg &>/dev/null; then
gpg=gpg gpg=gpg
else else
# Succeed but don't return anything. # Succeed but don't return anything.

2
tests/test-delta-ed25519.sh
View File

@ -34,7 +34,7 @@ ostree_repo_init repo --mode=archive
mkdir files mkdir files
for bin in ${bindatafiles}; do for bin in ${bindatafiles}; do
cp $(which ${bin}) files cp $(command -v ${bin}) files
done done
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files

2
tests/test-delta-sign.sh
View File

@ -35,7 +35,7 @@ ostree_repo_init repo --mode=archive
mkdir files mkdir files
for bin in ${bindatafiles}; do for bin in ${bindatafiles}; do
cp $(which ${bin}) files cp $(command -v ${bin}) files
done done
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files

2
tests/test-delta.sh
View File

@ -33,7 +33,7 @@ ostree_repo_init repo --mode=archive
mkdir files mkdir files
for bin in ${bindatafiles}; do for bin in ${bindatafiles}; do
cp $(which ${bin}) files cp $(command -v ${bin}) files
done done
${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files ${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files