rebuild-scripts bumpspecfile.py,1.15,1.16

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	bumpspecfile.py 
Log Message:
Some pkgs mix jpp style versioning with fedora pre-release versioning,
so be more strict in matching/bumping them.



Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bumpspecfile.py	8 Mar 2008 21:52:23 -0000	1.15
+++ bumpspecfile.py	8 Mar 2008 23:39:31 -0000	1.16
@@ -91,8 +91,14 @@
 
     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<pre>0\.)?(?P<rel>\d+)(?P<jpp>jpp\.)(?P<post>.*)', re.I)
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError