Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
Date: Fri, 29 Jan 2021 23:50:55
Message-Id: 1611799606.2d348c2e9d063662a9fd4526d77fd28cacf233ce.mattst88@gentoo
1 commit: 2d348c2e9d063662a9fd4526d77fd28cacf233ce
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 24 01:54:16 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 28 02:06:46 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d348c2e
7
8 catalyst: Use lazy % formatting in logging functions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 catalyst/base/stagebase.py | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
16 index 25efd4b3..28ff8fd2 100644
17 --- a/catalyst/base/stagebase.py
18 +++ b/catalyst/base/stagebase.py
19 @@ -823,7 +823,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
20 repo_conf_chroot = self.to_chroot(repo_conf)
21 repo_conf_chroot.parent.mkdir(mode=0o755, parents=True, exist_ok=True)
22
23 - log.info(f'Creating repo config {repo_conf_chroot}.')
24 + log.info('Creating repo config %s.', repo_conf_chroot)
25
26 try:
27 with open(repo_conf_chroot, 'w') as f:
28 @@ -846,10 +846,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
29 location_chroot = self.to_chroot(location)
30 location_chroot.mkdir(mode=0o755, parents=True, exist_ok=True)
31
32 - log.info(f'Copying overlay dir {x} to {location_chroot}')
33 + log.info('Copying overlay dir %s to %s', x, location_chroot)
34 cmd(f'cp -a {x}/* {location_chroot}', env=self.env)
35 else:
36 - log.warning(f'Skipping missing overlay {x}.')
37 + log.warning('Skipping missing overlay %s.', x)
38
39 def root_overlay(self):
40 """ Copy over the root_overlay """