Change the default value of the cpu option to "none" since there's no actual autodete...

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 483b9261d9f87af53be9e085ecc7cb6ef474288d..010d54113d74a859e9eb6e8416ca0e11e501790b 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -6,11 +6,11 @@ Distributed under the LGPL
 */
 
 #include <errno.h>
-#include <iostream>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
+#include <msp/io/print.h>
 #include "builder.h"
 #include "copy.h"
 #include "package.h"
@@ -25,7 +25,7 @@ Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d)
 {
        announce(pkg.get_name(), "COPY", dest[-1]);
        if(builder.get_verbose()>=2)
-               cout<<s<<" -> "<<d<<'\n';
+               IO::print("%s -> %s\n", s, d);
 
        if(!builder.get_dry_run())
                worker=new Worker(*this);
@@ -42,16 +42,16 @@ void Copy::Worker::main()
 {
        FS::mkpath(FS::dirname(copy.dest), 0755);
 
-       try
-       {
-               // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-               unlink(copy.dest);
-       }
-       catch(const SystemError &e)
+       // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+       if(FS::exists(copy.dest))
        {
-               if(e.get_error_code()!=ENOENT)
+               try
+               {
+                       unlink(copy.dest);
+               }
+               catch(const Exception &e)
                {
-                       cerr<<e.what()<<'\n';
+                       IO::print(IO::cerr, "%s\n", e.what());
                        done=error=true;
                        return;
                }
@@ -72,7 +72,7 @@ void Copy::Worker::main()
        }
        catch(const Exception &e)
        {
-               cerr<<e.what()<<'\n';
+               IO::print(IO::cerr, "%s\n", e.what());
                done=error=true;
                return;
        }