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 162291381F3 for ; Fri, 2 Aug 2013 05:59:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0422E099F; Fri, 2 Aug 2013 05:59: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 3F9B3E099F for ; Fri, 2 Aug 2013 05:59:44 +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 2147333EB56 for ; Fri, 2 Aug 2013 05:59:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5483FE468F for ; Fri, 2 Aug 2013 05:59:41 +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: <1375423150.1082b4471613842494261d74ec2598b4191056c9.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/livecd_stage2_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1082b4471613842494261d74ec2598b4191056c9 X-VCS-Branch: master Date: Fri, 2 Aug 2013 05:59:41 +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: 5461a5b2-ff01-4aee-a858-f48ca4ed1a57 X-Archives-Hash: b6f6e81e30a47d9f41b066dbff2f05f6 commit: 1082b4471613842494261d74ec2598b4191056c9 Author: Brian Dolbec gentoo org> AuthorDate: Fri Aug 2 05:59:10 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Aug 2 05:59:10 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1082b447 Fix incorrect type for livecd/modblacklist. Bug reported by tstellar. --- modules/livecd_stage2_target.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index f816b21..5be8fd2 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -68,6 +68,9 @@ class livecd_stage2_target(generic_stage_target): raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/modprobe.d/blacklist.conf." 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()