diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 17:19:45 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 17:19:45 -0400 |
| commit | 1ab5df5b1ed6b6082ba453677450bb1b177fcfc0 (patch) | |
| tree | d120763b02be939b9e3a0190c5f4920c2d07c9d8 /src/lib/Bcfg2/Server/Plugin/helpers.py | |
| parent | f6b458324f0be89f48229d4d1b5f3be9ae047497 (diff) | |
| download | bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.tar.gz bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.tar.bz2 bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.zip | |
fixed regex errors introduced by 6c996f42c53a36fc0406f836d64b8c1bec6f4bcc
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin/helpers.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 0123d68a1..8cc1439e0 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -1152,7 +1152,7 @@ class EntrySet(Debuggable): #: file is encountered that does not match the ``basename`` #: argument passed to the constructor or ``ignore``, then a #: warning will be produced. - ignore = re.compile(r'^(\.#.*|.*~|\\..*\\.(sw[px])|.*\\.genshi_include)$') + ignore = re.compile(r'^(\.#.*|.*~|\..*\.(sw[px])|.*\.genshi_include)$') # The ``basename`` argument passed to the constructor will be #: processed as a string that contains a regular expression (i.e., @@ -1215,8 +1215,8 @@ class EntrySet(Debuggable): base_pat = basename else: base_pat = re.escape(basename) - pattern = r'(.*/)?%s(\.((H_(?P<hostname>\S+))|' % base_pat - pattern += r'(G(?P<prio>\d+)_(?P<group>\S+))))?$' + pattern = r'(.*/)?' + base_pat + \ + r'(\.((H_(?P<hostname>\S+))|(G(?P<prio>\d+)_(?P<group>\S+))))?$' #: ``specific`` is a regular expression that is used to #: determine the specificity of a file in this entry set. It |