Gentoo Archives: gentoo-commits

From: Wiktor W Brodlo <wiktor@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/
Date: Wed, 06 Jul 2011 14:32:04
Message-Id: 9076704c42a0336e030ec2caf8db6a796042a994.wiktor@gentoo
1 commit: 9076704c42a0336e030ec2caf8db6a796042a994
2 Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
3 AuthorDate: Wed Jul 6 14:31:25 2011 +0000
4 Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
5 CommitDate: Wed Jul 6 14:31:25 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=9076704c
7
8 gentoo/utils.py: Don't unmask everything
9
10 ---
11 gentoo/utils.py | 16 ++++++++++------
12 1 files changed, 10 insertions(+), 6 deletions(-)
13
14 diff --git a/gentoo/utils.py b/gentoo/utils.py
15 index a959b6e..9b0507c 100644
16 --- a/gentoo/utils.py
17 +++ b/gentoo/utils.py
18 @@ -1041,16 +1041,20 @@ class GentooInstall:
19 self._progress.set_fraction(0.0)
20 self._progress.set_text(_("Installing configuration helpers"))
21 shutil.copy2("/etc/resolv.conf", self._root+"/etc/")
22 - os.environ["USE"] = "policykit -gtk -X -gpm "
23 - self.install_masked_package("-1 system-config-date")
24 + os.environ["USE"] = "policykit -gtk -X -gpm"
25 + os.mkdir(self._root+"/etc/portage")
26 + keywordsf = open(self._root+"/etc/portage/package.keywords", "w")
27 + keywordsf.write("dev-python/rhpl ~amd64\n")
28 + keywordsf.close()
29 + self.install_package("-1 system-config-date")
30 self._progress.set_fraction(0.2)
31 - self.install_masked_package("-1 system-config-keyboard")
32 + self.install_package("-1 system-config-keyboard")
33 self._progress.set_fraction(0.4)
34 - self.install_masked_package("-1 system-config-users")
35 + self.install_package("-1 system-config-users")
36 self._progress.set_fraction(0.6)
37 - self.install_masked_package("-1 keyboard-configuration-helpers")
38 + self.install_package("-1 keyboard-configuration-helpers")
39 self._progress.set_fraction(0.8)
40 - self.install_masked_package("-1 language-configuration-helpers")
41 + self.install_package("-1 language-configuration-helpers")
42 self._progress.set_fraction(1.0)
43 del os.environ["USE"]