rebuild-scripts bumpspecfile.py,1.21,1.22

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	bumpspecfile.py 
Log Message:
handle bad pre-release values and drop re.I where it is not needed


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bumpspecfile.py	9 Mar 2008 01:44:10 -0000	1.21
+++ bumpspecfile.py	9 Mar 2008 02:36:54 -0000	1.22
@@ -78,45 +78,47 @@
                 break
 
     def increaseMain(self, release):
-        relre = re.compile(r'^(?P<pre>0\.)?(?P<rel>\d+)(?P<post>.*)', re.I)
+        if release.startswith('0.'):
+            relre = re.compile(r'^0\.(?P<rel>\d+)(?P<post>.*)')
+            pre = True
+        else:
+            relre = re.compile(r'^(?P<rel>\d+)(?P<post>.*)')
+            pre = False
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError
-        pre = relmatch.group('pre') or ''
         value = int(relmatch.group('rel'))
         post = relmatch.group('post')
 
-        old = pre
-        old += relmatch.group('rel')+post
-        
-        if pre == '':
+        if not pre:
             if post.find('rc')>=0:
                 print 'WARNING: Bad pre-release versioning scheme:', self.filename
                 raise BumpSpecError
             new = `value+1`+post
         else:
-            if value == None or value > 10000:
-                print 'WARNING: Bad pre-release versioning scheme:', self.filename
-                raise BumpSpecError
             new = '0.'+`value+1`+post
         return new
 
     def increaseJPP(self, release):
         """Fedora jpackage release versioning scheme"""
 
-        relre = re.compile(r'(?P<prefix>\.)?(?P<rel>\d+)(?P<jpp>jpp\.)(?P<post>.*)', re.I)
+        relre = re.compile(r'(?P<prefix>.*)(?P<rel>\d+)(?P<jpp>jpp\.)(?P<post>.*)')
         relmatch = relre.search(release)
         if not relmatch:  # pattern match failed
             raise BumpSpecError
         
+        prefix = relmatch.group('prefix')
+        value = int(relmatch.group('rel'))
+        jpp = relmatch.group('jpp')
         post = relmatch.group('post')
+
         newpost = self.increaseMain(post)
-        new = release.replace(post, newpost)
+        new = prefix+str(value)+jpp+newpost
         return new
 
     def increaseFallback(self, release):
         """bump at the very-right or add .1 as a last resort"""
-        relre = re.compile(r'(?P<prefix>.+\.)(?P<post>\d+$)', re.I)
+        relre = re.compile(r'(?P<prefix>.+\.)(?P<post>\d+$)')
         relmatch = relre.search(release)
         if relmatch:
             prefix = relmatch.group('prefix')