revisor/base.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
New commits:
commit 34ea5b5e58d208e87c900dea03294d12c20c6121
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Feb 11 16:31:46 2009 +0100
This does not help because it's copying symbolic links
Revert "Make copying the installation tree over to it's new location a little
more efficient"
This reverts commit 0323188416a673417015104a5c50c35144b0aa19.
diff --git a/revisor/base.py b/revisor/base.py
index 75ae3c6..af18de5 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1999,23 +1999,9 @@ class RevisorBase:
if self.cfg.media_installation_tree:
tree_dst =
os.path.join(self.cfg.destination_directory,"os",self.cfg.architecture)
tree_src = mypungi.topdir
-
- # Find the number of files in tree_src for a progress bar
- num_files = 0
- for root, dirs, files in os.walk(tree_src):
- num_files += len(files)
-
+ self.log.debug(_("Copying %s to %s") % (tree_src,tree_dst),
level=1)
try:
- if self.cfg.copy_local:
- self.log.debug(_("Copying %s to %s (%d files)") %
(tree_src,tree_dst,num_files), level=1)
- shutil.copytree(tree_src,tree_dst)
- else:
- try:
- self.log.debug(_("Moving %s to %s (%d files)") %
(tree_src,tree_dst,num_files), level=1)
- shutil.move(tree_src,tree_dst)
- except Exception, e:
- self.log.error(_("Moving of the installation tree failed
(trying copy):\n\n%s") % '\n'.join(e), recoverable=True)
- shutil.copytree(tree_src,tree_dst)
+ shutil.copytree(tree_src,tree_dst)
except Exception, e:
self.log.error(_("Copying of the installation tree
failed:\n\n%s") % '\n'.join(e), recoverable=True)
Show replies by date