Changeset 503

Timestamp:

Nov 27, 2007, 1:56:57 AM (16 years ago)

Author:

Peter Johansson

Message:

Fixes bug in Date class related to Daylight saving time. Also fixes ticket #282 (catch exception 'directory already exists' in main)

Location:

trunk

Files:

• bin/svndigest.cc (modified) (1 diff)
• lib/Date.cc (modified) (2 diffs)

trunk/bin/svndigest.cc

@@ -111 +111 @@
   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())
-    throw std::runtime_error(std::string("svndigest: directory (") +
-                             target_path + ") already exists");
+  if (need_to_erase_target && !option->force()) {
+    std::cerr << "svndigest: directory `" 
+              << target_path << "' already exists\n";
+    exit(-1);
+  }
 
   // Extract repository location

trunk/lib/Date.cc

@@ -116 +116 @@
     std::stringstream sstream(str);
     struct tm* timeinfo = std::localtime(&time_);
+    size_t timezone_correction = timeinfo->tm_gmtoff;
 
     u_int year, month, day, hour, minute, second;
@@ -144 +145 @@
 
     time_ = mktime(timeinfo);
-    time_ += timeinfo->tm_gmtoff;
+    time_ += timezone_correction;
   }