From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9082F138AE9 for ; Fri, 29 Dec 2017 02:27:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4222E0DD0; Fri, 29 Dec 2017 02:27:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4912E0DD0 for ; Fri, 29 Dec 2017 02:27:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5B2134165D for ; Fri, 29 Dec 2017 02:27:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41C45AFC0 for ; Fri, 29 Dec 2017 02:27:45 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1514513115.16cb2fcfa1fac91f877a5f41ddb97eee68208466.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 16cb2fcfa1fac91f877a5f41ddb97eee68208466 X-VCS-Branch: master Date: Fri, 29 Dec 2017 02:27:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0e53259b-955b-4628-8904-ff0c0deec929 X-Archives-Hash: caf5487f17b5096b57fd23d09d720db7 commit: 16cb2fcfa1fac91f877a5f41ddb97eee68208466 Author: Yuta SATOH gmail com> AuthorDate: Fri Dec 29 01:42:12 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Dec 29 02:05:15 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=16cb2fcf stagebase.py: Update umount cmd, add env=self.env # 363577 Bug url: https://bugs.gentoo.org/363577 catalyst/base/stagebase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 8f9a5dbd..32cc3df1 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1002,7 +1002,7 @@ class StageBase(TargetBase, ClearBase, GenBase): continue try: - cmd(['umount', target]) + cmd(['umount', target], env=self.env) except CatalystError: log.warning('First attempt to unmount failed: %s', target) log.warning('Killing any pids still running in the chroot') @@ -1010,7 +1010,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.kill_chroot_pids() try: - cmd(['umount', target]) + cmd(['umount', target], env=self.env) except CatalystError: ouch = 1 log.warning("Couldn't umount bind mount: %s", target)