diff options
author | 2011-07-21 22:17:54 +0000 | |
---|---|---|
committer | 2011-07-21 22:17:54 +0000 | |
commit | e197c645c70efcd0e6d0beb9d1e2df52aa60a08d (patch) | |
tree | fe00f930c027f11cb0424cef681049cb5760dcf6 | |
parent | gentoo/utils.py: copy_files is not global (diff) | |
download | anaconda-e197c645c70efcd0e6d0beb9d1e2df52aa60a08d.tar.gz anaconda-e197c645c70efcd0e6d0beb9d1e2df52aa60a08d.tar.bz2 anaconda-e197c645c70efcd0e6d0beb9d1e2df52aa60a08d.zip |
gentoo/utils.py: revert d511d5d13cdf9f543421fe2da718027377692939
-rw-r--r-- | gentoo/utils.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gentoo/utils.py b/gentoo/utils.py index 42f745e..7548d51 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -752,18 +752,25 @@ class GentooInstall: def emit_install_done(self): # user installed Gentoo, w00hooh! pass - - def copy_files(self, path_from, path_to): + + def live_install(self): + """ + This function copies the stage3 into self._root + """ + + + action = _("System Installation") copy_update_interval = 10 copy_update_counter = 9 # get file counters total_files = 0 - image_dir = path_to + image_dir = self._prod_root for z,z,files in os.walk(image_dir): for file in files: total_files += 1 self._progress.set_fraction(0.0) + self._progress.set_text(action) def copy_other(fromfile, tofile): proc = subprocess.Popen(("/bin/cp", "-a", fromfile, tofile), @@ -792,7 +799,7 @@ class GentooInstall: os.symlink(source_link, tofile) current_counter = 0 - currentfile = path_from + currentfile = "/" image_dir_len = len(image_dir) # Create the directory structure # self.InstallFilesToIgnore @@ -863,17 +870,7 @@ class GentooInstall: self._progress.set_fraction(1) - def live_install(self): - """ - This function copies the stage3 into self._root - """ - - action = _("Installing stage3") - - self.copy_files(self._prod_root, "/") - self._progress.set_text(_("Installation complete")) - def language_packs_install(self): return |