Changeset 1073

Timestamp:

Jun 6, 2010, 6:13:22 AM (11 years ago)

Author:

Peter Johansson

Message:

remove check that is already done in Parameter class

File:

• trunk/bin/svndigest.cc (modified) (2 diffs)

trunk/bin/svndigest.cc

@@ -93 +93 @@
   Configuration& config = Configuration::instance();
 
-  // check if target already exists and behave appropriately
-  bool need_to_erase_target=false;
-  std::string target_path=option.targetdir() + '/' + file_name(option.root());
-  if (option.report()) {
-    if (option.verbose())
-      std::cout << "Checking target directory" << std::endl;
-    need_to_erase_target = node_exist(target_path);
-    if (need_to_erase_target && !option.force()) {
-      std::cerr << "svndigest: directory `" 
-                << target_path << "' already exists\n";
-      exit(EXIT_FAILURE);
-    }
-  }
-
   // Extract repository location
   std::string repo;
@@ -143 +129 @@
   if (option.report()) {
     // remove target if needed
-    if (need_to_erase_target) {
+    std::string target_path = concatenate_path(option.targetdir(), 
+                                               file_name(option.root()));
+    if (node_exist(target_path)) {
+      assert(option.force());
       if (option.verbose())
         std::cout << "Removing old target tree: " << target_path << "\n";