diff --git a/src/pylorax/sysutils.py b/src/pylorax/sysutils.py index e63757c8..232f6ddd 100644 --- a/src/pylorax/sysutils.py +++ b/src/pylorax/sysutils.py @@ -325,20 +325,22 @@ class SmartCopy(object): os.unlink(dst) # copy all the files - try: - map(lambda (src, dst): shutil.copy2(src, dst), self.copyfiles) - except shutil.Error as why: - err_msg = "error copying file {0} -> {1}: {2}" - err_msg = err_msg.format(src, dst, why) - raise SmartCopyError(err_msg) + for src, dst in self.copyfiles: + try: + shutil.copy2(src, dst) + except shutil.Error as why: + err_msg = "error copying file {0} -> {1}: {2}" + err_msg = err_msg.format(src, dst, why) + raise SmartCopyError(err_msg) # create symlinks - try: - map(lambda (target, name): symlink_(target, name), self.links) - except OSError as why: - err_msg = "error creating symlink {0} -> {1}: {2}" - err_msg = err_msg.format(name, target, why) - raise SmartCopyError(err_msg) + for target, name in self.links: + try: + symlink_(target, name) + except OSError as why: + err_msg = "error creating symlink {0} -> {1}: {2}" + err_msg = err_msg.format(name, target, why) + raise SmartCopyError(err_msg) # XXX