diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-03-04 15:56:09 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-03-04 15:56:09 -0500 |
| commit | f26780538a46beac2655230a93bd2134af7fc5bc (patch) | |
| tree | 01a5688eb599c9c054b1dd72ef4c228220f9580a /src | |
| parent | 73a4e8648c501437b3b1f4bd95e9c4023da9b681 (diff) | |
| download | bcfg2-f26780538a46beac2655230a93bd2134af7fc5bc.tar.gz bcfg2-f26780538a46beac2655230a93bd2134af7fc5bc.tar.bz2 bcfg2-f26780538a46beac2655230a93bd2134af7fc5bc.zip | |
fixed handling of group- and host-specific .genshi templates in Cfg (non-greedy matching)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index f851b7914..42cfb288d 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -66,7 +66,7 @@ def process_delta(data, delta): class CfgMatcher: def __init__(self, fname): name = re.escape(fname) - self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|.G(?P<prio>\d+)_(?P<group>\S+))(?P<genshi>\\.genshi)?$' % name) + self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+?)|.G(?P<prio>\d+)_(?P<group>\S+?))(?P<genshi>\\.genshi)?$' % name) self.delta_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|\\.G(?P<prio>\d+)_(?P<group>\S+))\\.(?P<delta>(cat|diff))$' % name) self.cat_count = fname.count(".cat") self.diff_count = fname.count(".diff") |