Changeset 117

Timestamp:

Jun 30, 2006, 2:46:22 PM (15 years ago)

Author:

Peter Johansson

Message:

fixed bug with root and target

Location:

trunk/bin

Files:

• Parameter.cc (modified) (2 diffs)
• svnstat.cc (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -85 +85 @@
   {
 
+    // making root absolute
+    std::string workdir(pwd());
+    chdir(root_.c_str());
+    root_ = pwd();
+    // remove trailing '/'
+    if (*root_.rbegin()=='/')
+      root_.erase(root_.begin()+root_.size()-1);
+    chdir(workdir.c_str());
+
+    // making targetdir absolute
+    chdir(targetdir_.c_str());
+    targetdir_ = pwd();
+    // remove trailing '/'
+    if (*targetdir_.rbegin()=='/')
+      root_.erase(targetdir_.begin()+targetdir_.size()-1);
+    chdir(workdir.c_str());
+
     struct stat buf;
     // check that root directory exists
@@ -95 +112 @@
                                ": No such directory.");
     }
-      
-    // making root absolute
-    std::string workdir(pwd());
-    chdir(root_.c_str());
-    root_ = pwd();
-    // remove trailing '/'
-    if (*root_.rbegin()=='/')
-      root_.erase(root_.begin()+root_.size()-1);
-
-    // making targetdir absolute
-    chdir(targetdir_.c_str());
-    targetdir_ = pwd();
-    // remove trailing '/'
-    if (*targetdir_.rbegin()=='/')
-      root_.erase(targetdir_.begin()+targetdir_.size()-1);
-
-    chdir(workdir.c_str());
 
   }

trunk/bin/svnstat.cc

@@ -64 +64 @@
     std::string root_path(option->targetdir()+'/'+file_name(option->root()));
     struct stat buf;
-    if (!stat(root_path.c_str(),&buf))
+    if (!stat(root_path.c_str(),&buf)){
+      if (option->verbose())
+        std::cout << "rm -rf " << root_path << "\n";
       rmdirhier(root_path);
+    }
   }
   else {