diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2010-08-06 02:44:21 +0000 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2010-08-11 15:59:58 -0500 |
commit | def7fbd92d988851b94636175b5bab998407c4e6 (patch) | |
tree | 5d02a5c959538640a02f76d61f14af2b14181639 /src/lib/Server/Plugins | |
parent | 0c366586f5037f2f91ac0452fc47936ddb9716e3 (diff) | |
download | bcfg2-def7fbd92d988851b94636175b5bab998407c4e6.tar.gz bcfg2-def7fbd92d988851b94636175b5bab998407c4e6.tar.bz2 bcfg2-def7fbd92d988851b94636175b5bab998407c4e6.zip |
Probes: Fix name collapse in case of group specific probes (arch.G20_foo -> arch) (Resolves Ticket #904)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6003 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins')
-rw-r--r-- | src/lib/Server/Plugins/Probes.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Server/Plugins/Probes.py index 22df03a64..c00185732 100644 --- a/src/lib/Server/Plugins/Probes.py +++ b/src/lib/Server/Plugins/Probes.py @@ -3,7 +3,7 @@ import re import Bcfg2.Server.Plugin -specific_probe_matcher = re.compile("(.*/)?(?P<basename>\S+)(.(?P<mode>[GH])_\S+)") +specific_probe_matcher = re.compile("(.*/)?(?P<basename>\S+)(.(?P<mode>[GH](\d\d)?)_\S+)") probe_matcher = re.compile("(.*/)?(?P<basename>\S+)") class ProbeSet(Bcfg2.Server.Plugin.EntrySet): |