From 9199237b01687e1e0842f3926fd01b695014df2b Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Wed, 11 Apr 2018 18:06:39 -0400 Subject: [PATCH] Don't scan uncompressed_objects_dir if it doesn't exist A newly created archive-mode repository won't have a uncompressed-objects-cache directory, and uncompressed_objects_dir is -1 to flag that. The special meaning of -1 meaning "cwd" for libglnx means that the current directory was scanned as if it was an objects directory, producing unexpected results, especially if there were any two-letter files/subdirs in the current directory. Closes: #1537 Approved by: jlebon --- src/libostree/ostree-repo-commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 37f832c8..5fd97902 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -1438,7 +1438,8 @@ scan_loose_devino (OstreeRepo *self, return FALSE; } - if (self->mode == OSTREE_REPO_MODE_ARCHIVE) + if (self->mode == OSTREE_REPO_MODE_ARCHIVE && + self->uncompressed_objects_dir_fd != -1) { if (!scan_one_loose_devino (self, self->uncompressed_objects_dir_fd, devino_cache, cancellable, error))