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

lib/repo-commit: Fix min-free-space error message 

Since min_free_space_size_mb is considered before min_free_space_percent
in min_free_space_calculate_reserved_blocks(), it has to be considered
first when generating the error message in order for it to be accurate.

Closes: #1691
Approved by: jlebon
This commit is contained in:
Matthew Leeds 2018-07-24 14:52:24 -07:00 committed by Atomic Bot
parent 93da568422
commit be07c04e63
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-repo-commit.c
View File

@ -445,10 +445,10 @@ throw_min_free_space_error (OstreeRepo *self,
else else
err_msg = "would be exceeded"; err_msg = "would be exceeded";
if (self->min_free_space_percent > 0) if (self->min_free_space_mb > 0)
return glnx_throw (error, "min-free-space-percent '%u%%' %s", self->min_free_space_percent, err_msg);
else
return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB %s", self->min_free_space_mb, err_msg); return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB %s", self->min_free_space_mb, err_msg);
else
return glnx_throw (error, "min-free-space-percent '%u%%' %s", self->min_free_space_percent, err_msg);
} }
typedef struct { typedef struct {