From d6f7c89d762191e0845e3636c0bc0cc1989b209f Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 10 Oct 2014 19:41:59 +0300 Subject: [PATCH] Make use of Task's file affinity and unlinking capabilities in Copy --- source/copy.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/source/copy.cpp b/source/copy.cpp index 24be942..2d2a7ca 100644 --- a/source/copy.cpp +++ b/source/copy.cpp @@ -28,7 +28,10 @@ Task *Copy::run(const Target &target) const { const InstalledFile &install = dynamic_cast(target); Worker *worker = new Worker(install); - return new InternalTask(worker); + InternalTask *task = new InternalTask(worker); + task->add_file(install.get_path()); + task->set_unlink(); + return task; } @@ -41,22 +44,6 @@ void Copy::Worker::main() const FileTarget &source = target.get_source(); const FS::Path &src_path = source.get_path(); const FS::Path &dst_path = target.get_path(); - FS::mkpath(FS::dirname(dst_path), 0755); - - // Remove old file. Not doing this would cause Bad Stuff when installing libraries. - if(FS::exists(dst_path)) - { - try - { - unlink(dst_path); - } - catch(const exception &e) - { - IO::print(IO::cerr, "%s\n", e.what()); - status = Task::ERROR; - return; - } - } try { -- 2.45.2