rebuild-scripts bumpspecfile.py,1.14,1.15

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Sat Mar 8 21:52:23 UTC 2008


Author: mschwendt

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

Modified Files:
	bumpspecfile.py 
Log Message:
don't process remaining spec files lines if a release value was bumped already


Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bumpspecfile.py	8 Mar 2008 21:51:21 -0000	1.14
+++ bumpspecfile.py	8 Mar 2008 21:52:23 -0000	1.15
@@ -40,11 +40,17 @@
                        (re.compile(r"^%define\s+baserelease\s+(\d+.*)"), self.increase),
                        ]
         skip_pattern = re.compile(r"\$Revision:")
+        bumped = False
         for i in range(len(self.lines)):
             if skip_pattern.search(self.lines[i]):
                 continue
             for bumpit, bumpit_func in bump_patterns:
-                self.lines[i] = bumpit.sub(bumpit_func, self.lines[i])
+                (self.lines[i], n) = bumpit.subn(bumpit_func, self.lines[i], 1)
+                if n:
+                    bumped = True
+                    break
+            if bumped:
+                break
 
     def addChangelogEntry(self, evr, entry, email):
         if len(evr):




More information about the fedora-extras-commits mailing list