From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QdrZn-0002Z4-00 for garchives@archives.gentoo.org; Mon, 04 Jul 2011 22:25:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7910F21C088; Mon, 4 Jul 2011 22:24:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3669221C088 for ; Mon, 4 Jul 2011 22:24:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7498C1B4006 for ; Mon, 4 Jul 2011 22:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BF74F8003D for ; Mon, 4 Jul 2011 22:24:36 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <3e4f4bc617fe6107ff661705ae359084c9311c12.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/ X-VCS-Repository: proj/anaconda X-VCS-Files: gentoo/livecd.py gentoo/utils.py X-VCS-Directories: gentoo/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 3e4f4bc617fe6107ff661705ae359084c9311c12 Date: Mon, 4 Jul 2011 22:24:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 29da0152c48bec1e5fbabf01a1f79655 commit: 3e4f4bc617fe6107ff661705ae359084c9311c12 Author: wiktor w brodlo brodlo net> AuthorDate: Mon Jul 4 21:41:26 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Mon Jul 4 21:41:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D3e4f4bc6 Set profile and update the progress bar --- gentoo/livecd.py | 1 + gentoo/utils.py | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/gentoo/livecd.py b/gentoo/livecd.py index 19e755d..a59612c 100644 --- a/gentoo/livecd.py +++ b/gentoo/livecd.py @@ -118,6 +118,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): # Now copy the portage tree self._gentoo_install.copy_portage() self._gentoo_install.install_setup_tools() + self._gentoo_install.set_profile() =20 self._gentoo_install.setup_users() self._gentoo_install.setup_language() # before ldconfig, thx diff --git a/gentoo/utils.py b/gentoo/utils.py index 60c332a..af1f17e 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -777,8 +777,8 @@ class GentooInstall: # self._setup_packages_to_remove() =20 action =3D _("System Installation") - copy_update_interval =3D 100 - copy_update_counter =3D 99 + copy_update_interval =3D 10 + copy_update_counter =3D 9 # get file counters total_files =3D 0 image_dir =3D self._prod_root @@ -1053,15 +1053,32 @@ class GentooInstall: =20 def copy_portage(self): self._progress.set_fraction(0.0) - self._progress.set_text(_("Copying the Portage tree")) + self._progress.set_text(_("Copying the Portage tree (can take a = long time)")) subprocess.call(["cp", "--recursive", "/usr/portage", self._root= +"/usr/"]) # We need some packages from anaconda-overlay but ideally they s= hould be added to portage self._progress.set_fraction(0.5) subprocess.call(["cp", "--recursive", "/anaconda-overlay", self.= _root+"/usr/portage"]) + self._progress.set_fraction(1) =20 def install_setup_tools(self): - self._portage.install("system-config-date system-config-keyboard syste= m-config-users") - self._portage.install("keyboard-configuration-helpers language-configu= ration-helpers") + self._progress.set_fraction(0.0) + self._progress.set_text(_("Installing configuration helpers")) + self.install_package("system-config-date") =20 + self._progress.set_fraction(0.2) + self.install_package("system-config-keyboard") + self._progress.set_fraction(0.4) + self.install_package("system-config-users") + self._progress.set_fraction(0.6) + self.install_package("keyboard-configuration-helpers") + self._progress.set_fraction(0.8) + self.install_package("language-configuration-helpers") + self._progress.set_fraction(1.0) + =09 + def set_profile(self): + self._progress.set_fraction(0.0) + self._progress.set_text(_("Setting profile %s" % self._anaconda.= profile)) + self.spawn_chroot("eselect profile set "+self._anaconda.profile) + self._progress.set_fraction(1.0) =20 #def _get_langpacks(self): # return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \