summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins
diff options
context:
space:
mode:
authorGordon Messmer <gordon@dragonsdawn.net>2016-04-21 13:56:36 -0700
committerGordon Messmer <gordon@dragonsdawn.net>2016-04-21 13:56:36 -0700
commitf41f11d434af21cf021fe53f662d5d2d1ebbb853 (patch)
tree5e80a46d544a31513ea6056d44602f933f7141fc /src/lib/Bcfg2/Server/Plugins
parentf9c60b4c04086a3f653eaa0b5be9d5398a7f27ae (diff)
downloadbcfg2-f41f11d434af21cf021fe53f662d5d2d1ebbb853.tar.gz
bcfg2-f41f11d434af21cf021fe53f662d5d2d1ebbb853.tar.bz2
bcfg2-f41f11d434af21cf021fe53f662d5d2d1ebbb853.zip
Handle rid intelligently, to avoid infinite loop.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Yum.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 14d6db8a0..846fb89cd 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -456,16 +456,13 @@ class YumCollection(Collection):
reponame = basereponame
added = False
+ rid = 1
while not added:
try:
config.add_section(reponame)
added = True
except ConfigParser.DuplicateSectionError:
- match = re.search(r'-(\d+)', reponame)
- if match:
- rid = int(match.group(1)) + 1
- else:
- rid = 1
+ rid += 1
reponame = "%s-%d" % (basereponame, rid)
config.set(reponame, "name", reponame)