Changeset 304

Timestamp:

May 11, 2007, 10:42:04 PM (16 years ago)

Author:

Peter Johansson

Message:

added some check if config file is valid fixes #181

Location:

trunk

Files:

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

trunk/bin/svndigest.cc

@@ -71 +71 @@
       exit(-1);
     }
-    config.load(is);
+    try { 
+      config.load(is);
+    }
+    catch (std::runtime_error e) {
+      std::cerr << e.what() << std::endl;
+      exit(-1);
+    }
     is.close();
   }

trunk/lib/Configuration.cc

@@ -84 +84 @@
           std::stringstream mess;
           mess << "svndigest: invalid config file: "
-               << "in copright-alias section" << key + "defined twice.";
+               << "in copright-alias section " << key + " defined twice.";
           throw std::runtime_error(mess.str());
         }
@@ -96 +96 @@
         getline(ss, tmp);
         std::string value = trim(tmp);
-        if (key=="trac-ticket"){
-          std::cerr << "svndigest: warning: config variable trac-ticket "
-                    << "is deprecated. Use trac-root instead.\n";
-          trac_root_ = value.substr(0,value.size()-7);
-        }
-        if (key=="trac-revision"){
-          std::cerr << "svndigest: warning: config variable trac-revision "
-                    << "is deprecated. Use trac-root instead.\n";
-          trac_root_ = value.substr(0,value.size()-10);
-        }
         if (key=="trac-root")
           trac_root_=value;
+        else {
+          std::stringstream mess;
+          mess << "svndigest: invalid config file: "
+               << "in trac section" << key + " is invalid option.";
+          throw std::runtime_error(mess.str());
+        }
       }
     }

trunk/lib/Configuration.h

@@ -50 +50 @@
 
     /// 
+    /// throw if stream is not a valid config
+    ///
     /// @brief load configuration from stream
     ///