X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=6ad2a5e791d1705509f9bff208b27e3819764044;hb=921fc49488a68442fb8794e1a0284a3bf1e7b91b;hp=8d18ec8001279403bc827926da8203e507671f28;hpb=0f12a599f28748cef9c09dfb7a3b018b29ade6df;p=builder.git diff --git a/source/copy.cpp b/source/copy.cpp index 8d18ec8..6ad2a5e 100644 --- a/source/copy.cpp +++ b/source/copy.cpp @@ -25,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()) { @@ -47,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; @@ -71,6 +75,7 @@ void Copy::Worker::main() return; } + // Actual transfer loop char buf[16384]; while(!in.eof()) { @@ -78,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);