Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/640'
Browse files Browse the repository at this point in the history
* origin/pr/640:
  Enhance grammar in `qmemman`

Pull request description:

I know typo/grammar-fixing PRs are usually frowned upon as "trying to get clout for contributing to X" but I've recently been spending some time in the dom0 journal and some of those strings have been irking me a bit, I don't think I'll be the only one to say that they could sound better and more professional.
  • Loading branch information
marmarek committed Dec 26, 2024
2 parents f66c912 + 8a66084 commit 3494e02
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions qubes/qmemman/systemstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def get_free_xen_memory(self):
)
elif xen_free < assigned_but_unused + self.XEN_FREE_MEM_MIN:
self.log.error(
"Xen free = {!r} too small for satisfy assignments! "
"Xen free = {!r} too small to satisfy assignments! "
"assigned_but_unused={!r}, domdict={!r}".format(
xen_free, assigned_but_unused, self.domdict
)
Expand Down Expand Up @@ -350,7 +350,7 @@ def print_stats(self, xenfree, memset_reqs):
def do_balance(self):
self.log.debug("do_balance()")
if os.path.isfile("/var/run/qubes/do-not-membalance"):
self.log.debug("do-not-membalance file preset, returning")
self.log.debug("do-not-membalance file present, returning")
return

self.refresh_memactual()
Expand Down Expand Up @@ -406,7 +406,7 @@ def do_balance(self):
== self.domdict[dom2].memory_actual
):
self.log.warning(
"dom {!r} didnt react to memory request"
"dom {!r} did not react to memory request"
" (holds {}, requested balloon down to {})".format(
dom2,
self.domdict[dom2].memory_actual,
Expand All @@ -416,8 +416,8 @@ def do_balance(self):
self.domdict[dom2].no_progress = True
else:
self.log.warning(
"dom {!r} still hold more"
" memory than have assigned ({} > {})".format(
"dom {!r} still holds more"
" memory than assigned ({} > {})".format(
dom2,
self.domdict[dom2].memory_actual,
mem2,
Expand Down

0 comments on commit 3494e02

Please sign in to comment.