Changeset 810

Timestamp:

Aug 6, 2009, 5:49:16 AM (12 years ago)

Author:

Peter Johansson

Message:

fixes #389

Location:

trunk/lib

Files:

• File.cc (modified) (1 diff)
• rmdirhier.cc (modified) (2 diffs)

trunk/lib/File.cc

@@ -427 +427 @@
     catch (std::runtime_error e) {
       // catch exception, cleanup, and rethrow
-      std::cerr << "File::print_copyright: Exception caught, "
+      std::cerr << "svndigest: File::print_copyright: Exception caught, "
                 << "removing temporary file " << tmpname << std::endl;
       if (unlink(tmpname))

trunk/lib/rmdirhier.cc

@@ -25 +25 @@
 
 #include <dirent.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <iostream>
@@ -43 +44 @@
     }
     catch(const BadDirectory& x) {
-      std::cerr << "Invalid directory: " << x.what() << std::endl;
+      std::cerr << "svndigest: " << x.what() << "\n" 
+                << strerror(errno) << std::endl;
     }
     catch(const DirectoryOpenError& x) {
-      std::cerr << "Error opening directory: " << x.what() << std::endl;
+      std::cerr << "svndigest: cannot open directory " << x.what() << "\n" 
+                << strerror(errno) << "\n";
     }
     catch(const FileDeleteError& x) {
-      std::cerr << "Error deleting file: " << x.what() << std::endl;
+      std::cerr << "svndigest: cannot delete file " << x.what() << "\n"
+                << strerror(errno) << "\n";
     }
     catch(const DirectoryDeleteError& x) {
-      std::cerr << "Error deleting directory: " << x.what() << std::endl;
-    }
-    catch(const DirectoryError& x) {
-      std::cerr << "Directory error:" << x.what() << std::endl;
+      std::cerr << "svndigest: cannot delete directory " << x.what() << "\n"
+                << strerror(errno) << "\n";
     }