Fix the test case

diff --git a/snapper/AsciiFile.cc b/snapper/AsciiFile.cc
index 04714ab9bffaaaad24b0ae7d49a8b2368ba367fc..f86a7a7db4f9d042b0f9f1a76a29baa9b528603d 100644 (file)
--- a/snapper/AsciiFile.cc
+++ b/snapper/AsciiFile.cc
@@ -226,7 +226,9 @@ AsciiFile::save()
     bool
     SysconfigFile::getValue(const string& key, string& value) const
     {
-       Regex rx('^' + Regex::ws + key + '=' + "(['\"]?)([^'\"]*)\\1" + Regex::ws + '$');
+        Regex rx('^' + Regex::ws +
+                 key + '=' + "(['\"]?)([^'\"]*)\\1" +
+                 Regex::ws + Regex::trailing_comment + '$');
 
        if (find_if(lines(), regex_matches(rx)) == lines().end())
            return false;

diff --git a/snapper/Regex.cc b/snapper/Regex.cc
index 6f078a9f06c19f31541da98e59628a2092f920ae..1a33acc727ba2d6afde13952f3c830b6bab1de07 100644 (file)
--- a/snapper/Regex.cc
+++ b/snapper/Regex.cc
@@ -97,5 +97,6 @@ Regex::cap (unsigned int i) const
 
 const string Regex::ws = "[ \t]*";
 const string Regex::number = "[0123456789]+";
+const string Regex::trailing_comment = "(#.*)?";
 
 }

diff --git a/snapper/Regex.h b/snapper/Regex.h
index 8dd5aa9f341c5fb433433d0ed97de2ca1c2b913e..00ff1db8f9a044839e07d6e21e1c8c5c60e65d0d 100644 (file)
--- a/snapper/Regex.h
+++ b/snapper/Regex.h
@@ -54,6 +54,7 @@ public:
 
     static const string ws;
     static const string number;
+    static const string trailing_comment;
 
 private: