Make use of Task's file affinity and unlinking capabilities in Copy

diff --git a/source/copy.cpp b/source/copy.cpp
index 24be942532b83ab52a0dcfdeb8446ad29d708edf..2d2a7ca9c023c557954e05924d9181f4280dae97 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -28,7 +28,10 @@ Task *Copy::run(const Target &target) const
 {
        const InstalledFile &install = dynamic_cast<const InstalledFile &>(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
        {