diff options
| author | Colin Walters <walters@verbum.org> | 2021-03-26 21:52:26 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2021-03-31 15:11:34 -0400 |
| commit | cb0fd2bf93b52335225ad3921b4897bc8cc30266 (patch) | |
| tree | 0964d2f7ecaecc8e81a5d578772a9688e44e4aad /tests/pull-test.sh | |
| parent | 7170cf9efda8f97d75c31d6415180b8895a5a479 (diff) | |
| download | ostree-cb0fd2bf93b52335225ad3921b4897bc8cc30266.tar.gz | |
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.
Diffstat (limited to 'tests/pull-test.sh')
| -rw-r--r-- | tests/pull-test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/pull-test.sh b/tests/pull-test.sh index 08921838..5e719bf8 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh @@ -196,7 +196,7 @@ if ! skip_one_without_user_xattrs; then # Preserve user.ostreemeta xattr cp -a ${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 fatal "corrupt repo fsck?" fi @@ -631,12 +631,12 @@ if has_gpgme; then objpath=objects/${csum::2}/${csum:2}.commitmeta remotesig=ostree-srv/gnomerepo/$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 assert_not_reached "pull with gpg-verify unexpectedly succeeded?" fi # 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 echo "ok pull signed commit" rm $localsig |