packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/pull-test: Use mv -f in a few cases 

For some reason I'm hitting this locally because some files are mode `0`.
Which is clearly a different bug but anyways we don't want to prompt.
This commit is contained in:
Colin Walters 2021-03-26 21:52:26 +00:00
parent 7170cf9efd
commit cb0fd2bf93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/pull-test.sh
View File

@ -196,7 +196,7 @@ if ! skip_one_without_user_xattrs; then
# Preserve user.ostreemeta xattr # Preserve user.ostreemeta xattr
cp -a ${path}{,.new} cp -a ${path}{,.new}
(dd if=${path} conv=swab) > ${path}.new (dd if=${path} conv=swab) > ${path}.new
mv ${path}{.new,} mv -f ${path}{.new,}
if ${CMD_PREFIX} ostree --repo=cacherepo fsck 2>err.txt; then if ${CMD_PREFIX} ostree --repo=cacherepo fsck 2>err.txt; then
fatal "corrupt repo fsck?" fatal "corrupt repo fsck?"
fi fi
@ -631,12 +631,12 @@ if has_gpgme; then
objpath=objects/${csum::2}/${csum:2}.commitmeta objpath=objects/${csum::2}/${csum:2}.commitmeta
remotesig=ostree-srv/gnomerepo/$objpath remotesig=ostree-srv/gnomerepo/$objpath
localsig=repo/$objpath localsig=repo/$objpath
mv $remotesig $remotesig.bak mv -f $remotesig $remotesig.bak
if ${CMD_PREFIX} ostree --repo=repo --depth=0 pull origin main; then if ${CMD_PREFIX} ostree --repo=repo --depth=0 pull origin main; then
assert_not_reached "pull with gpg-verify unexpectedly succeeded?" assert_not_reached "pull with gpg-verify unexpectedly succeeded?"
fi fi
# ok now check that we can pull correctly # ok now check that we can pull correctly
mv $remotesig.bak $remotesig mv -f $remotesig.bak $remotesig
${CMD_PREFIX} ostree --repo=repo pull origin main ${CMD_PREFIX} ostree --repo=repo pull origin main
echo "ok pull signed commit" echo "ok pull signed commit"
rm $localsig rm $localsig