rebuild-scripts bumpspecfile.py,1.3,1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27542

Modified Files:
	bumpspecfile.py 
Log Message:
- simplify increase() and remove the superfluous increaseSafe()
- comment on the two match groups



Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bumpspecfile.py	23 Feb 2008 00:43:35 -0000	1.3
+++ bumpspecfile.py	23 Feb 2008 01:14:19 -0000	1.4
@@ -75,6 +75,8 @@
         old = release
         relre = re.compile(r'(?P<pre>0\.)?(?P<rel>\d+)(?P<jpp>jpp\.)(?P<post>.*)', re.I)
         relmatch = relre.search(release)
+        if not relmatch:  # pattern match failed
+            raise BumpSpecError
         
         pre = relmatch.group('pre') or ''
         value = int(relmatch.group('rel'))
@@ -100,19 +102,16 @@
         self.debugdiff(old, new)
         return new
 
-    def increaseSafe(self, release):
-        if release.find('jpp')>0:
-            new = self.increaseJPP(release)
-        else:
-            new = self.increaseMain(release)
-        return new
-
     def increase(self, match):
-        old = match.group(1)
+        old = match.group(1)  # only the release value
         try:
-            new = self.increaseSafe(old)
+            if old.find('jpp')>0:
+                new = self.increaseJPP(old)
+            else:
+                new = self.increaseMain(old)
         except BumpSpecError:
             new = self.increaseFallback(old)
+        # group 0 is the full line that defines the release
         return match.group(0).replace(old, new)
 
     def writeFile(self, filename):