Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
Date: Fri, 29 Dec 2017 02:27:50
Message-Id: 1514513115.16cb2fcfa1fac91f877a5f41ddb97eee68208466.dolsen@gentoo
1 commit: 16cb2fcfa1fac91f877a5f41ddb97eee68208466
2 Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 29 01:42:12 2017 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 29 02:05:15 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=16cb2fcf
7
8 stagebase.py: Update umount cmd, add env=self.env # 363577
9
10 Bug url: https://bugs.gentoo.org/363577
11
12 catalyst/base/stagebase.py | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
16 index 8f9a5dbd..32cc3df1 100644
17 --- a/catalyst/base/stagebase.py
18 +++ b/catalyst/base/stagebase.py
19 @@ -1002,7 +1002,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
20 continue
21
22 try:
23 - cmd(['umount', target])
24 + cmd(['umount', target], env=self.env)
25 except CatalystError:
26 log.warning('First attempt to unmount failed: %s', target)
27 log.warning('Killing any pids still running in the chroot')
28 @@ -1010,7 +1010,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
29 self.kill_chroot_pids()
30
31 try:
32 - cmd(['umount', target])
33 + cmd(['umount', target], env=self.env)
34 except CatalystError:
35 ouch = 1
36 log.warning("Couldn't umount bind mount: %s", target)