From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Tue, 24 Jul 2018 21:52:24 +0000 (-0700)
Subject: lib/repo-commit: Fix min-free-space error message
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~20^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=be07c04e638c26df06bfa0c0ee9769faf847bfc4;p=ostree.git

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
---

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index bbbe1961..39f19362 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -445,10 +445,10 @@ throw_min_free_space_error (OstreeRepo  *self,
   else
     err_msg  = "would be exceeded";
 
-  if (self->min_free_space_percent > 0)
-    return glnx_throw (error, "min-free-space-percent '%u%%' %s", self->min_free_space_percent, err_msg);
-  else
+  if (self->min_free_space_mb > 0)
     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 {