lib/repo: Use correct name for tmpdir lockfile

Such an evil bug 🙈. I was just reading an strace trying to figure out what was
going on, and noticed we had the `XXXXXX` in the lockfile name. It was only
after that I realized that that this might *be* the cause of the skopeo issue.

This is another case where we definitely need more test coverage of things that
actually use the API multiple times in process; might look at dusting off the
work for the rpm-ostree test.

Closes: https://github.com/ostreedev/ostree/issues/1196

Closes: #1204
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-09-21 14:50:54 -04:00 committed by Atomic Bot
parent e689b8b4a5
commit ae075d23e3
1 changed files with 1 additions and 1 deletions

View File

@ -4990,7 +4990,7 @@ _ostree_repo_allocate_tmpdir (int tmpdir_dfd,
/* Note, at this point we can race with another process that picks up this /* Note, at this point we can race with another process that picks up this
* new directory. If that happens we need to retry, making a new directory. */ * new directory. If that happens we need to retry, making a new directory. */
if (!_ostree_repo_try_lock_tmpdir (tmpdir_dfd, tmpdir_name_template, if (!_ostree_repo_try_lock_tmpdir (new_tmpdir.src_dfd, new_tmpdir.path,
file_lock_out, &did_lock, file_lock_out, &did_lock,
error)) error))
return FALSE; return FALSE;