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 1Qk0ZV-00058U-Ql for garchives@archives.gentoo.org; Thu, 21 Jul 2011 21:14:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7952F21C130; Thu, 21 Jul 2011 21:14:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 48F4F21C130 for ; Thu, 21 Jul 2011 21:14:04 +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 937541B4003 for ; Thu, 21 Jul 2011 21:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BB0BA8003D for ; Thu, 21 Jul 2011 21:14:02 +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: Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/ X-VCS-Repository: proj/anaconda X-VCS-Files: gentoo/utils.py X-VCS-Directories: gentoo/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: ec00840494484c246b43c423bc1bbb73e0c0febd Date: Thu, 21 Jul 2011 21:14:02 +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: 9424c68210d50523fff3de2298488623 commit: ec00840494484c246b43c423bc1bbb73e0c0febd Author: wiktor w brodlo brodlo net> AuthorDate: Thu Jul 21 21:13:40 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Thu Jul 21 21:13:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3Dec008404 gentoo/utils.py: break the copying out of live_install for other funcs --- gentoo/utils.py | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gentoo/utils.py b/gentoo/utils.py index 7548d51..dcf186a 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -752,25 +752,18 @@ class GentooInstall: def emit_install_done(self): # user installed Gentoo, w00hooh! pass - - def live_install(self): - """ - This function copies the stage3 into self._root - """ - - - action =3D _("System Installation") + =20 + def copy_files(self, path_from, path_to): copy_update_interval =3D 10 copy_update_counter =3D 9 # get file counters total_files =3D 0 - image_dir =3D self._prod_root + image_dir =3D path_to for z,z,files in os.walk(image_dir): for file in files: total_files +=3D 1 =20 self._progress.set_fraction(0.0) - self._progress.set_text(action) =20 def copy_other(fromfile, tofile): proc =3D subprocess.Popen(("/bin/cp", "-a", fromfile, tofile= ), @@ -799,7 +792,7 @@ class GentooInstall: os.symlink(source_link, tofile) =20 current_counter =3D 0 - currentfile =3D "/" + currentfile =3D path_from image_dir_len =3D len(image_dir) # Create the directory structure # self.InstallFilesToIgnore @@ -870,7 +863,17 @@ class GentooInstall: =20 self._progress.set_fraction(1) =20 + def live_install(self): + """ + This function copies the stage3 into self._root + """ + + action =3D _("Installing stage3") + + copy_files(self._prod_root, "/") + self._progress.set_text(_("Installation complete")) + =20 =20 def language_packs_install(self): return