[gentoo-commits] proj/anaconda:master commit in: gentoo/

[Wiktor W Brodlo]

commit:     559bda2a9472f03be99235be80fe262e41b03663
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Tue Jul  5 13:54:57 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Tue Jul  5 13:54:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=559bda2a

Fix profile selection

---
 gentoo/__init__.py |   18 +++++++-----------
 gentoo/livecd.py   |    8 ++++----
 gentoo/utils.py    |    5 ++---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 594214c..e01844b 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -24,42 +24,38 @@ import sys
 
 class Portage:
 
-	def __init__(self, terminal):
+	def __init__(self, terminal, root):
 		print "Portage init!"
 		self.term = terminal
+		self.root = root
 
 	# Syncs the Portage tree and updates Portage if an update is available
 	def sync(self):
-		print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync"
-		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --sync")
+		self.term.run_command("chroot "+self.root+" emerge --sync")
 		if self.term.get_child_exit_status() != 0:
 			return False
-		print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage"
-		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --update portage")
+		self.term.run_command("chroot "+self.root+" emerge --update portage")
 		if self.term.get_child_exit_status() == 0:
 			return True
 		return False
 
 	# Installs a package atom
 	def install(self, atom):
-		print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom
-		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge "+atom)
+		self.term.run_command("chroot "+self.root+" emerge "+atom)
 		if self.term.get_child_exit_status() == 0:
 			return True
 		return False
 
 	# Updates world
 	def update_world(self):
-		print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world"
-		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge --deep --newuse --update world")
+		self.term.run_command("chroot "+self.root+" emerge --deep --newuse --update world")
 		if self.term.get_child_exit_status() == 0:
 			return True
 		return False
 
 	# Removes a package atom
 	def remove(self, atom):
-		print "chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom
-		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" emerge -C "+atom)
+		self.term.run_command("chroot "+self.root+" emerge -C "+atom)
 		if self.term.get_child_exit_status() == 0:
 			return True
 		return False

diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 40c8005..c9e7402 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -57,8 +57,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._root = anaconda.rootPath
 
         self.osimg = anaconda.methodstr[8:]
-	# On Gentoo we're using a stage3 as an installation source
-	# FIXME: Replace this with checking for stage3
+        # On Gentoo we're using a stage3 as an installation source
+        # FIXME: Replace this with checking for stage3
         #if not os.path.ismount(self.osimg):
         #    anaconda.intf.messageWindow(_("Unable to find image"),
         #       _("The given location [%s] isn't a valid %s "
@@ -112,11 +112,11 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._progress.set_label(_("Installing Gentoo onto hard drive."))
         self._progress.set_fraction(0.0)
         
-        self._gentoo_install.copy_portage()
         # Actually install
         self._gentoo_install.live_install()
         
         # Now copy the portage tree
+        self._gentoo_install.copy_portage()
         self._gentoo_install.set_profile()
         self._gentoo_install.install_setup_tools()
         
@@ -137,7 +137,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._gentoo_install.setup_audio()
         self._gentoo_install.setup_xorg()
         self._gentoo_install.remove_proprietary_drivers()
-	# TODO: This needs to be tried and fixed properly on Gentoo once installing X works
+        # TODO: This needs to be tried and fixed properly on Gentoo once installing X works
         try:
             self._gentoo_install.setup_nvidia_legacy()
         except Exception as e:

diff --git a/gentoo/utils.py b/gentoo/utils.py
index 904563a..56ee310 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -173,7 +173,7 @@ class GentooInstall:
         self._prod_root = productPath
         self._intf = anaconda.intf
         self._progress = GentooProgress(anaconda)
-        self._portage = Portage(anaconda._intf.instProgress.terminal)
+        self._portage = Portage(anaconda._intf.instProgress.terminal, self._root)
 		# I'm wondering what's it actually for. ~w.
         #self._settings = SystemSettings()
         with open("/proc/cmdline", "r") as cmd_f:
@@ -216,7 +216,6 @@ class GentooInstall:
         pid = os.fork()
         if pid == 0:
 
-            print "chrooting to "+self._root
             os.chroot(self._root)
             os.chdir("/")
             do_shell = False
@@ -1074,7 +1073,7 @@ class GentooInstall:
         self._progress.set_fraction(0.8)
         self.install_package("-1 language-configuration-helpers")
         self._progress.set_fraction(1.0)
-    	
+    
     def set_profile(self):
         self._progress.set_fraction(0.0)
         self._progress.set_text(_("Setting profile %s" % self._anaconda.profile))