From f41f11d434af21cf021fe53f662d5d2d1ebbb853 Mon Sep 17 00:00:00 2001
From: Gordon Messmer <gordon@dragonsdawn.net>
Date: Thu, 21 Apr 2016 13:56:36 -0700
Subject: Handle rid intelligently, to avoid infinite loop.

---
 src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

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)
-- 
cgit v1.2.3-1-g7c22