Skip to content

Commit

Permalink
Merge branch 'abderrahim/fuse3' into 'master'
Browse files Browse the repository at this point in the history
mount: don't pass nonempty option

See merge request BuildStream/buildstream!1834
  • Loading branch information
abderrahim committed Mar 30, 2020
2 parents 0b11fcb + d874977 commit ceb38d1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/buildstream/_fuse/mount.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def __run_fuse(self, filename):
# will handle SIGTERM and gracefully exit its own little main loop.
#
try:
FUSE(self.__operations, self.__mountpoint, nothreads=True, foreground=True, nonempty=True,
FUSE(self.__operations, self.__mountpoint, nothreads=True, foreground=True,
**self._fuse_mount_options)
except RuntimeError as exc:
# FUSE will throw a RuntimeError with the exit code of libfuse as args[0]
Expand Down

0 comments on commit ceb38d1

Please sign in to comment.