Skip to content

Commit fc1eda4

Browse files
authored
Merge branch 'master' into fix_logging
2 parents e256c21 + 14d280d commit fc1eda4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ Fixed
9494
* Fixed a regression in the ``linux.dig`` action on Python 3. (bug fix) #4993
9595

9696
Contributed by @blag
97+
* Fixed a bug in pack installation logging code where unicode strings were not being
98+
interpolated properly. (bug fix)
99+
100+
Contributed by @misterpah
97101
* Fixed a compatibility issue with the latest version of the ``logging`` library API
98102
where the ``find_caller()`` function introduced some new variables. (bug fix)
99103

st2common/st2common/util/pack_management.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def apply_pack_owner_group(pack_path):
327327
pack_group = utils.get_pack_group()
328328

329329
if pack_group:
330-
LOG.debug('Changing owner group of "%s" directory to %s' % (pack_path, pack_group))
330+
LOG.debug('Changing owner group of "{}" directory to {}'.format(pack_path, pack_group))
331331

332332
if SUDO_BINARY:
333333
args = ['sudo', 'chgrp', '-R', pack_group, pack_path]
@@ -339,8 +339,8 @@ def apply_pack_owner_group(pack_path):
339339

340340
if exit_code != 0:
341341
# Non fatal, but we still log it
342-
LOG.debug('Failed to change owner group on directory "%s" to "%s": %s' %
343-
(pack_path, pack_group, stderr))
342+
LOG.debug('Failed to change owner group on directory "{}" to "{}": {}'
343+
.format(pack_path, pack_group, stderr))
344344

345345
return True
346346

0 commit comments

Comments
 (0)