Attachment 892836 Details for Bug 1094709 – Patch

[patch] Patch

0001-Do-not-match-upstream-version-if-scm-contains-pre-re.patch (text/plain), 1.46 KB, created by Josef Stribny on 2014-05-06 10:37:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Stribny

Created: 2014-05-06 10:37:42 UTC

Size: 1.46 KB

patch

obsolete

>From 6e57629afc9842dcf7a72f4afc4aeeda419d3fee Mon Sep 17 00:00:00 2001
>From: Josef Stribny <jstribny@redhat.com>
>Date: Tue, 6 May 2014 11:56:35 +0200
>Subject: [PATCH] Do not match upstream version if scm contains pre-release of
> that version
>
>---
> cnucnu/scm.py | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/cnucnu/scm.py b/cnucnu/scm.py
>index 5fe2793..befa985 100755
>--- a/cnucnu/scm.py
>+++ b/cnucnu/scm.py
>@@ -19,7 +19,8 @@
> 
> # Options: http://curl.haxx.se/libcurl/c/curl_easy_setopt.html
> 
>-from helper import secure_download
>+import re
>+from helper import secure_download, get_rc
> from config import global_config
> 
> 
>@@ -53,10 +54,19 @@ class SCM(object):
> 
>     def has_upstream_version(self, package):
>         sourcefiles = self.get_sourcefiles(package)
>-        for file in sourcefiles:
>-            if package.latest_upstream in file:
>-                return True
>-        return False
>+        rc = ''.join(get_rc(package.repo_release))
>+        # Do not match upstream version if scm contains pre-release
>+        if rc:
>+            regex = re.compile('.*'+package.latest_upstream+'(?!\.'+rc+').*')
>+            for file in sourcefiles:
>+                if regex.match(file):
>+	            return True
>+            return False
>+        else:
>+            for file in sourcefiles:
>+                if package.latest_upstream in file:
>+                    return True
>+            return False
> 
> 
> if __name__ == '__main__':
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1094709: 892836