Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: modules/
Date: Fri, 02 Aug 2013 05:59:45
Message-Id: 1375423150.1082b4471613842494261d74ec2598b4191056c9.dol-sen@gentoo
1 commit: 1082b4471613842494261d74ec2598b4191056c9
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 2 05:59:10 2013 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Fri Aug 2 05:59:10 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1082b447
7
8 Fix incorrect type for livecd/modblacklist.
9
10 Bug reported by tstellar.
11
12 ---
13 modules/livecd_stage2_target.py | 3 +++
14 1 file changed, 3 insertions(+)
15
16 diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
17 index f816b21..5be8fd2 100644
18 --- a/modules/livecd_stage2_target.py
19 +++ b/modules/livecd_stage2_target.py
20 @@ -68,6 +68,9 @@ class livecd_stage2_target(generic_stage_target):
21 raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/modprobe.d/blacklist.conf."
22
23 myf.write("\n#Added by Catalyst:")
24 + # workaround until config.py is using configparser
25 + if isinstance(self.settings["livecd/modblacklist"], str):
26 + self.settings["livecd/modblacklist"] = self.settings["livecd/modblacklist"].split()
27 for x in self.settings["livecd/modblacklist"]:
28 myf.write("\nblacklist "+x)
29 myf.close()