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 F3C93138247 for ; Thu, 21 Nov 2013 09:06:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E59E8E0A49; Thu, 21 Nov 2013 09:06:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 451AEE0A4A for ; Thu, 21 Nov 2013 09:06:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7B6F33F326 for ; Thu, 21 Nov 2013 09:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 22921E54C7 for ; Thu, 21 Nov 2013 09:06:35 +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: <1385024412.f0105a0b726047cf83c8263024c1ecf6049ce48d.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: f0105a0b726047cf83c8263024c1ecf6049ce48d X-VCS-Branch: 3.0 Date: Thu, 21 Nov 2013 09:06:35 +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: b950cb04-28f8-4060-8e03-568005455e78 X-Archives-Hash: d687938af9bdfd790a9273cc947b840a commit: f0105a0b726047cf83c8263024c1ecf6049ce48d Author: Brian Dolbec gentoo org> AuthorDate: Fri Aug 2 01:02:36 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Nov 21 09:00:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f0105a0b 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()