Attachment 611412 Details for Bug 789330 – proposed fix

[patch] proposed fix

bumpall.patch (text/plain), 1.92 KB, created by Michael Schwendt on 2012-09-10 12:13:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Schwendt

Created: 2012-09-10 12:13:33 UTC

Size: 1.92 KB

patch

obsolete

>--- /usr/bin/rpmdev-bumpspec	2012-09-02 23:19:58.000000000 +0200
>+++ rpmdev-bumpspec	2012-09-10 14:11:31.262652484 +0200
>@@ -54,7 +54,6 @@
>         )
> 
>     def bumpRelease(self):
>-        bumped = False
>         for i in range(len(self.lines)):
>             skipped = False
>             for pattern in SpecFile._skip_patterns:
>@@ -66,24 +65,20 @@
>             for pattern in SpecFile._bump_patterns:
>                 (self.lines[i], n) = \
>                     pattern.subn(self.increase, self.lines[i], 1)
>-                bumped = bumped or n
>-        if bumped:
>-            return
>-
>-        # Here, no line matched at all.
>-        # Happens with macro-overloaded spec files e.g.
>-        # Bump ^Release: ... line least-significant.
>-        for i in range(len(self.lines)):
>-            if self.lines[i].startswith('Release:'):
>-                old = self.lines[i][len('Release:'):].rstrip()
>-                new = self.increaseFallback(old)
>-                if self.verbose:
>-                    self.debugdiff(old, new)
>-                if old != new:
>-                    self.lines[i] = self.lines[i].replace(old, new)
>-                    bumped = True
>-        if bumped:
>-            return
>+                if n:
>+                    break
>+            else:
>+                # Here, no line matched at all.
>+                # Happens with macro-overloaded spec files e.g.
>+                # Bump ^Release: ... line least-significant.
>+                if self.lines[i].startswith('Release:'):
>+                    old = self.lines[i][len('Release:'):].rstrip()
>+                    new = self.increaseFallback(old)
>+                    if self.verbose:
>+                        self.debugdiff(old, new)
>+                    if old != new:
>+                        self.lines[i] = self.lines[i].replace(old, new)
>+                        continue
> 
>         if self.verbose:
>             sys.stderr.write('ERROR: No release value matched: %s\n' %

Actions: View | Diff

Attachments on bug 789330: 560891 | 611412 | 819145