rebuild-scripts bumpspecfile.py,1.20,1.21

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	bumpspecfile.py 
Log Message:
for fedora jpp scheme with pre-releases always bump right of "jpp."


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bumpspecfile.py	9 Mar 2008 01:06:08 -0000	1.20
+++ bumpspecfile.py	9 Mar 2008 01:44:10 -0000	1.21
@@ -104,29 +104,18 @@
     def increaseJPP(self, release):
         """Fedora jpackage release versioning scheme"""
 
-        if release.startswith('0.'):
-            # Then it is the Fedora pre-release versioning scheme
-            # at the beginning.
-            return self.increaseMain(release)
-
-        old = release
-        relre = re.compile(r'^(?P<pre>0\.)?(?P<rel>\d+)(?P<jpp>jpp\.)(?P<post>.*)', re.I)
+        relre = re.compile(r'(?P<prefix>\.)?(?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'))
-        jpp = relmatch.group('jpp')
         post = relmatch.group('post')
-
         newpost = self.increaseMain(post)
-        new = pre+str(value)+jpp+newpost
+        new = release.replace(post, newpost)
         return new
 
     def increaseFallback(self, release):
         """bump at the very-right or add .1 as a last resort"""
-        old = release
         relre = re.compile(r'(?P<prefix>.+\.)(?P<post>\d+$)', re.I)
         relmatch = relre.search(release)
         if relmatch:
@@ -134,7 +123,7 @@
             post = relmatch.group('post')
             new = prefix+self.increaseMain(post)
         else:
-            new = old.rstrip()+'.1'
+            new = release.rstrip()+'.1'
         return new
 
     def increase(self, match):