Gentoo Archives: gentoo-commits

From: Wiktor W Brodlo <wiktor@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/anaconda:master commit in: installclasses/
Date: Sun, 26 Jun 2011 21:09:17
Message-Id: 3ec000d83ea524c3d2c4269fb9dab97ddcad146a.wiktor@gentoo
1 commit: 3ec000d83ea524c3d2c4269fb9dab97ddcad146a
2 Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
3 AuthorDate: Sun Jun 26 21:07:59 2011 +0000
4 Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
5 CommitDate: Sun Jun 26 21:07:59 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3ec000d8
7
8 installclasses/corecd.py: Removed Entropy reference
9
10 ---
11 installclasses/corecd.py | 10 +++++-----
12 1 files changed, 5 insertions(+), 5 deletions(-)
13
14 diff --git a/installclasses/corecd.py b/installclasses/corecd.py
15 index 85c6e98..0e655da 100644
16 --- a/installclasses/corecd.py
17 +++ b/installclasses/corecd.py
18 @@ -1,7 +1,9 @@
19 #
20 -# xfce.py
21 +# corecd.py
22 #
23 # Copyright (C) 2010 Fabio Erculiani
24 +# Copyright (C) 2011 wiktor w brodlo
25 +# Copyright (C) 2011 Gentoo Foundation
26 #
27 # This program is free software; you can redistribute it and/or modify
28 # it under the terms of the GNU General Public License as published by
29 @@ -29,7 +31,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
30
31 import installmethod
32
33 -from gentoo import Entropy
34 +from gentoo import Portage
35 from gentoo.livecd import LiveCDCopyBackend
36
37 class InstallClass(BaseInstallClass):
38 @@ -37,6 +39,7 @@ class InstallClass(BaseInstallClass):
39 id = "gentoo_corecd"
40 name = N_("Gentoo Core CD")
41
42 + # Get rid of this
43 _pixmap_dirs = os.getenv("PIXMAPPATH", "/usr/share/pixmaps").split(":")
44 for _pix_dir in _pixmap_dirs:
45 _pix_path = os.path.join(_pix_dir, "gentoo-core.png")
46 @@ -52,9 +55,6 @@ class InstallClass(BaseInstallClass):
47 _descriptionFields = (productName,)
48 sortPriority = 10000
49
50 - if not Entropy.is_corecd():
51 - hidden = 1
52 -
53 def configure(self, anaconda):
54 BaseInstallClass.configure(self, anaconda)
55 BaseInstallClass.setDefaultPartitioning(self,