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

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     607de627ad6a60288f14dd89f38458d701d738e3
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jun 25 01:40:54 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jun 25 01:40:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=607de627

Portage install method version 1 ;-)

---
 gentoo/__init__.py |  126 +++++++--------------------------------------------
 1 files changed, 18 insertions(+), 108 deletions(-)

diff --git a/gentoo/__init__.py b/gentoo/__init__.py
index 629cba8..1cb23d9 100644
--- a/gentoo/__init__.py
+++ b/gentoo/__init__.py
@@ -1,8 +1,9 @@
 #
-# gentoo.py: Gentoo Linux Anaconda install method backend
+# gentoo/__init__.py: Gentoo Portage Anaconda install method backend
 #
 #
-# Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo <wiktor@brodlo.net>
+# Copyright (C) 2011 Gentoo Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,113 +22,22 @@
 import os
 import sys
 
-# add Entropy module path to PYTHONPATH
-sys.path.insert(0, '/usr/lib/entropy/libraries')
+class Portage:
 
-# Entropy Interface
-from entropy.client.interfaces import Client
-from entropy.output import nocolor
-from entropy.fetchers import UrlFetcher
-import entropy.tools
+	def __init__(self, terminal):
+		self.term = terminal
+		# chroot into the new installation if not already there
+		self.term.run_command("chroot "+os.environ["ANACONDA_PRODUCTPATH"]+" 2> /dev/null")
 
-class Entropy(Client):
+	# Syncs the Portage tree and updates Portage if an update is available
+	def sync(self):
+		self.term.run_command("emerge --sync")
+		self.term.run_command("emerge --update portage")
 
-    def init_singleton(self):
-        self._progress = None
-        self.oldcount = []
-        Client.init_singleton(self, xcache = False,
-            url_fetcher = InstallerUrlFetcher)
-        nocolor()
+	# Installs a package atom
+	def install(self, atom):
+		terminal.run_command("emerge "+atom)
 
-    def connect_progress(self, progress):
-        self._progress = progress
-
-    def output(self, text, header = "", footer = "", back = False,
-        importance = 0, level = "info", count = None, percent = False):
-
-        if not self._progress:
-            return
-
-        if not self.oldcount:
-            self.oldcount = [0,100]
-
-        progress_text = text
-        if count:
-            try:
-                self.oldcount = int(count[0]),int(count[1])
-            except:
-                self.oldcount = [0,100]
-            if not percent:
-                count_str = "(%s/%s) " % (str(count[0]),str(count[1]),)
-                progress_text = count_str+progress_text
-
-        percentage = float(self.oldcount[0])/self.oldcount[1] * 100
-        percentage = round(percentage, 2)
-        self._progress.set_fraction(percentage)
-        self._progress.set_text(progress_text)
-
-    def is_installed(self, package_name):
-        match = self.installed_repository().atomMatch(package_name)
-        if match[0] != -1:
-            return True
-        return False
-
-    @staticmethod
-    def is_corecd():
-        if os.path.isfile("/etc/gentoo-edition"):
-            f = open("/etc/gentoo-edition","r")
-            cnt = f.readline().strip()
-            f.close()
-            if cnt.lower().find("core") != -1:
-                return True
-        return False
-
-    @staticmethod
-    def is_gentoo_mce():
-        with open("/proc/cmdline", "r") as cmd_f:
-            args = cmd_f.readline().strip().split()
-            for tstr in ("mceinstall", "gentoomce"):
-                if tstr in args:
-                    return True
-            return False
-
-# in this way, any singleton class that tries to directly load Client
-# gets Entropy in change
-Client.__singleton_class__ = Entropy
-
-class InstallerUrlFetcher(UrlFetcher):
-
-    gui_last_avg = 0
-
-    def handle_statistics(self, th_id, downloaded_size, total_size,
-            average, old_average, update_step, show_speed, data_transfer,
-            time_remaining, time_remaining_secs):
-        self.__average = average
-        self.__downloadedsize = downloaded_size
-        self.__remotesize = total_size
-        self.__datatransfer = data_transfer
-
-    def output(self):
-        """ backward compatibility """
-        return self.update()
-
-    def update(self):
-
-        myavg = abs(int(round(float(self.__average), 1)))
-        if abs((myavg - InstallerUrlFetcher.gui_last_avg)) < 1:
-            return
-
-        if (myavg > InstallerUrlFetcher.gui_last_avg) or (myavg < 2) or \
-            (myavg > 97):
-
-            cur_prog = float(self.__average)/100
-            cur_prog_str = str(int(self.__average))
-
-            human_dt = entropy.tools.bytes_into_human(self.__datatransfer)
-            prog_str = "%s/%s kB @ %s" % (
-                    str(round(float(self.__downloadedsize)/1024, 1)),
-                    str(round(self.__remotesize, 1)),
-                    str(human_dt) + "/sec",
-                )
-            Entropy().output(prog_str)
-            InstallerUrlFetcher.gui_last_avg = myavg
+	# Updates world
+	def update_world(self):
+		terminal.run_command("emerge --deep --newuse --update world")