X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=8d18ec8001279403bc827926da8203e507671f28;hb=0f12a599f28748cef9c09dfb7a3b018b29ade6df;hp=cdbbd48f1eead0b7c399a4b7ec7ad534252be2c4;hpb=5504b35e6c6cfb1cfa098b94e31cda173cc0482a;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index cdbbd48..8d18ec8 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <fstream>
+#include <iostream>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "copy.h"
@@ -12,24 +13,36 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path
 	Action(b),
 	src(s),
 	dest(d),
-	worker(*this)
+	worker(0)
 {
-	announce(pkg.get_name(), "INST", dest[-1]);
+	announce(pkg.get_name(), "COPY", dest[-1]);
 	if(builder.get_verbose()>=2)
 		cout<<s<<" -> "<<d<<'\n';
+	
+	if(!builder.get_dry_run())
+		worker=new Worker(*this);
 }
 
 int Copy::check()
 {
-	if(worker.get_done())
+	if(!worker)
+		return 0;
+	
+	if(worker->get_done())
 	{
 		signal_done.emit();
-		worker.join();
-		return worker.get_error()?1:0;
+		worker->join();
+		return worker->get_error()?1:0;
 	}
+	
 	return -1;
 }
 
+Copy::~Copy()
+{
+	delete worker;
+}
+
 void Copy::Worker::main()
 {
 	Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);