X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=6ad2a5e791d1705509f9bff208b27e3819764044;hb=55b6c1dba6f02a399d98080c23a75098e8a080f7;hp=1f764dc038045575bb526c44939fcad4ac72add5;hpb=f1c967215e6b08095bdf07518472beca3067ec37;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 1f764dc..6ad2a5e 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"
@@ -24,8 +25,11 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path
 
 int Copy::check()
 {
-	if(!worker)
+	if(!worker)  // True for dry run
+	{
+		signal_done.emit();
 		return 0;
+	}
 	
 	if(worker->get_done())
 	{
@@ -46,6 +50,7 @@ void Copy::Worker::main()
 {
 	Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
 	
+	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
 	if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
 	{
 		int err=errno;
@@ -70,6 +75,7 @@ void Copy::Worker::main()
 		return;
 	}
 
+	// Actual transfer loop
 	char buf[16384];
 	while(!in.eof())
 	{
@@ -77,6 +83,7 @@ void Copy::Worker::main()
 		out.write(buf, in.gcount());
 	}
 
+	// Preserve file permissions
 	struct stat st;
 	Path::stat(copy.src, st);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);