From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A068C1384B4 for ; Sat, 21 Nov 2015 01:34:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7DBC21C030; Sat, 21 Nov 2015 01:33:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A44421C031 for ; Sat, 21 Nov 2015 01:33:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AC19340ACE for ; Sat, 21 Nov 2015 01:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDA3A15B4 for ; Sat, 21 Nov 2015 01:33: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: <1447344967.a38ad7ad605a788fa1e84a4cfb2a6ee289b03670.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a38ad7ad605a788fa1e84a4cfb2a6ee289b03670 X-VCS-Branch: pending Date: Sat, 21 Nov 2015 01:33: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: a283f819-d23d-46b4-a43e-c19c8a1871d4 X-Archives-Hash: 6f356525368b772edb4c74251cd74f91 Message-ID: <20151121013345.0ja14juqyJcMhbGLlMKzYtqBHHU_RhZJLcKvO5IcfwI@z> commit: a38ad7ad605a788fa1e84a4cfb2a6ee289b03670 Author: Brian Dolbec gentoo org> AuthorDate: Thu Nov 12 16:16:07 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Nov 12 16:16:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a38ad7ad targets/livecd_stage2.py: Fix regression in path setting Since: Commit: 5cce2772eda7d0885c9d7cfea184a3f5606dddef Subject: catalyst: Convert nearly all use of open() to use the with statement. I incorrectly changed a "+" to a comma in the code move. catalyst/targets/livecd_stage2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 943466e..7d9919b 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -68,7 +68,7 @@ class livecd_stage2(StageBase): def run_local(self): # what modules do we want to blacklist? if "livecd/modblacklist" in self.settings: - path = normpath(self.settings["chroot_path"], + path = normpath(self.settings["chroot_path"] + "/etc/modprobe.d/blacklist.conf") try: with open(path, "a") as myf: