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 0368D1387B1 for ; Wed, 22 Jan 2014 05:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B66EDE1105; Wed, 22 Jan 2014 05:04:13 +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 1A1E0E1110 for ; Wed, 22 Jan 2014 05:04:12 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D41333FAE9 for ; Wed, 22 Jan 2014 05:04:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id F16DA187B7 for ; Wed, 22 Jan 2014 05:04:10 +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: <1388772141.34fb318df8a7341b5ccc5187b07a710c6fea49ec.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 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: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 34fb318df8a7341b5ccc5187b07a710c6fea49ec X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:10 +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: 91ee363e-018a-4aa5-99ec-4a56bdd6fd36 X-Archives-Hash: b744310ed687f7e0a8ef61ffe7e8f301 commit: 34fb318df8a7341b5ccc5187b07a710c6fea49ec Author: Brian Dolbec gentoo org> AuthorDate: Fri Aug 2 01:02:36 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 18:02:21 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=34fb318d Workaround fix for bug reported by tstellar. Will be fixed properly once config.py is migrated to configparser. --- catalyst/targets/livecd_stage2.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 4016f57..5f6e86c 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -79,6 +79,9 @@ class livecd_stage2(StageBase): print_traceback=True) myf.write("\n#Added by Catalyst:") + # workaround until config.py is using configparser + if isinstance(self.settings["livecd/modblacklist"], str): + self.settings["livecd/modblacklist"] = self.settings["livecd/modblacklist"].split() for x in self.settings["livecd/modblacklist"]: myf.write("\nblacklist "+x) myf.close()