diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-07-21 16:34:41 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-07-21 16:34:41 -0700 |
| commit | 1f3afa6bd29fe8f8c28977c58d4fa569f0054863 (patch) | |
| tree | e489c68d725feb5b085ab40f5e7e66ae47af4499 | |
| parent | d5ceda7ce1d94af06278e28e98dbccb848e91702 (diff) | |
| parent | 729c7c04e7fd020ec823cef1d954ed2695ff68b5 (diff) | |
| download | vyatta-cfg-1f3afa6bd29fe8f8c28977c58d4fa569f0054863.tar.gz vyatta-cfg-1f3afa6bd29fe8f8c28977c58d4fa569f0054863.zip | |
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg into larkspur
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 512dc3d..a3901a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.16.101) unstable; urgency=low + + * fix for bug 5887 + + -- An-Cheng Huang <ancheng@vyatta.com> Wed, 21 Jul 2010 15:18:43 -0700 + vyatta-cfg (0.16.100) unstable; urgency=low * support ipv4range and ! in val_help diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index d14e9eb..cb5e0dc 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -672,7 +672,7 @@ vyatta_parse_tmpl () } s/^tag:.*/vyatta_cfg_tag=1/p s/^multi:.*/vyatta_cfg_multi=1/p - s/^type:[ ]\+\([^ ;]\+\)\(;.*\)\?/vyatta_cfg_type=\1/p + s/^type:[ ]*\([^;]\+[^; ]\)[ ]*\(;.*\)\?$/vyatta_cfg_type="\1"/p s/^enumeration:[ ]\+\([^ ]\+\)/vyatta_cfg_enum=\1/p ' $1` |