[augeas-devel] [PATCH 1/6] Cgconfig: Fix parsing of group names

[Michael Chapman]

In:

  let id = /[a-zA-Z0-9_\-\/\.]+/

the hyphen was treated as a range, not a literal character.

Signed-off-by: Michael Chapman <mike at very.puzzling.org>
---
 lenses/cgconfig.aug            |    2 +-
 lenses/tests/test_cgconfig.aug |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lenses/cgconfig.aug b/lenses/cgconfig.aug
index d2f8a97..d42db14 100644
--- a/lenses/cgconfig.aug
+++ b/lenses/cgconfig.aug
@@ -26,7 +26,7 @@ module Cgconfig =
    let comment = Util.comment
    let empty   = Util.empty
 
-   let id        = /[a-zA-Z0-9_\-\/\.]+/
+   let id        = /[a-zA-Z0-9_\/.-]+/
    let name      = /[^#= \n\t{}\/]+/
    let cont_name = /(cpuacct|cpu|devices|ns|cpuset|memory|freezer|net_cls)/
    let role_name = /(admin|task)/
diff --git a/lenses/tests/test_cgconfig.aug b/lenses/tests/test_cgconfig.aug
index 44c2f45..973e53c 100644
--- a/lenses/tests/test_cgconfig.aug
+++ b/lenses/tests/test_cgconfig.aug
@@ -85,7 +85,7 @@ test Cgconfig.lns get group1 =
     {  } }
 
 let group2="
-group aa{
+group aa-1{
      perm {
 		 task { }
 		 admin { }
@@ -94,7 +94,7 @@ group aa{
 
 test Cgconfig.lns get group2 =
   {  }
-  { "group" = "aa"
+  { "group" = "aa-1"
     {  }
     { "perm"
       {  }
-- 
1.7.6.4