Changeset 691

Timestamp:

Sep 7, 2008, 7:44:00 PM (15 years ago)

Author:

Peter Johansson

Message:

fixes #350 - also changed test_repo.sh to catch this.

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• test/test_repo.sh.in (modified) (1 diff)

trunk/bin/svndigest.cc

@@ -106 +106 @@
 
   // check if target already exists and behave appropriately
-  if (option->verbose())
-    std::cout << "Checking target directory" << std::endl;
+  bool need_to_erase_target=false;
   std::string target_path=option->targetdir() + '/' + file_name(option->root());
-  bool 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(-1);
+  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(-1);
+    }
   }
 

trunk/test/test_repo.sh.in

@@ -34 +34 @@
 fi
 
-@abs_top_builddir@/bin/svndigest -r $rootdir -t $targetdir -f \
+@abs_top_builddir@/bin/svndigest -r $rootdir -t $targetdir \
 --ignore-cache --no-report $1;