Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 2/4] catalyst: Use lazy % formatting in logging functions
Date: Sun, 24 Jan 2021 15:07:30
Message-Id: 20210124150722.760520-2-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/4] catalyst: Remove unused import by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 catalyst/base/stagebase.py | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
7 index 676206ff..badcfefa 100644
8 --- a/catalyst/base/stagebase.py
9 +++ b/catalyst/base/stagebase.py
10 @@ -823,7 +823,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
11 repo_conf_chroot = self.to_chroot(repo_conf)
12 repo_conf_chroot.parent.mkdir(mode=0o755, parents=True, exist_ok=True)
13
14 - log.info(f'Creating repo config {repo_conf_chroot}.')
15 + log.info('Creating repo config %s.', repo_conf_chroot)
16
17 try:
18 with open(repo_conf_chroot, 'w') as f:
19 @@ -846,10 +846,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
20 location_chroot = self.to_chroot(location)
21 location_chroot.mkdir(mode=0o755, parents=True, exist_ok=True)
22
23 - log.info(f'Copying overlay dir {x} to {location_chroot}')
24 + log.info('Copying overlay dir %s to %s', x, location_chroot)
25 cmd(f'cp -a {x}/* {location_chroot}', env=self.env)
26 else:
27 - log.warning(f'Skipping missing overlay {x}.')
28 + log.warning('Skipping missing overlay %s.', x)
29
30 def root_overlay(self):
31 """ Copy over the root_overlay """
32 --
33 2.26.2