Attachment 315196 Details for Bug 460464 – nvr split using RE

[patch] nvr split using RE

rhnChannel.py.patch1 (text/plain), 2.93 KB, created by Daniel Mach on 2008-08-28 11:05:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Mach

Created: 2008-08-28 11:05:32 UTC

Size: 2.93 KB

patch

obsolete

>--- rhnChannel.py.orig	2008-08-28 12:48:25.000000000 +0200
>+++ rhnChannel.py.new1	2008-08-28 12:54:01.000000000 +0200
>@@ -2281,54 +2281,28 @@
> 
> # IN: 'e:name-version-release' or 'name-version-release:e'
> # OUT: {'name':name, 'version':version, 'release':release, 'epoch':epoch }
>-def make_evr(nvre, source=0):
>-    epoch = ''
>-    name = ''
>-    version = ''
>-    release = ''
>-    list = None
>-    ret = None
>-                                                                                                                                                                                    
>-    #There is an epoch. A ':' is only included when an epoch is present
>-    if string.find(nvre, ':') != -1:
>-        holder = string.split(nvre, ':')
>-                                                                                                                                                                                    
>-        #holder[0] has the n,v,r,a
>-        if string.find(holder[0], '-') != -1:
>-            holder[0] = string.split(holder[0], '-')
>-            ret = {
>-                'name'      :   holder[0][0],
>-                'version'   :   holder[0][1],
>-                'release'   :   holder[0][2],
>-                'epoch'     :   holder[1]
>-            }
>-        elif string.find(holder[1], '-') != -1:
>-            holder[1] = string.split(holder[1], '-')
>-            ret = {
>-                'name'      :   holder[1][0],
>-                'version'   :   holder[1][1],
>-                'release'   :   holder[1][2],
>-                'epoch'     :   holder[0]
>-            }
>+def make_evr(nvre, source=False):
>+    import re
>+    if ":" in nvre:
>+        nvr, epoch = nvre.rsplit(":", 1)
>+        if "-" in epoch:
>+            nvr, epoch = epoch, nvr
>         else:
>-            raise rhnFault(err_code = 21,
>-                err_text = "NVRE is missing name, version, or release.")
>-    elif string.find(nvre, '-') != -1:
>-        nvre = string.split(nvre, '-')
>-        ret = {
>-            'name'      :   nvre[0],
>-            'version'   :   nvre[1],
>-            'release'   :   nvre[2],
>-            'epoch'     :   None
>-        }
>-    else:
>-        return MakeEvrError(message = "NVRE is missing name, version, or release.")
>-    if source:
>-        for key in ret.keys():
>-            if ret[key]:
>-            	if string.find(ret[key], '.src') != -1:
>-                    ret[key] = string.replace(ret[key], '.src', "")
>-    return ret
>+        nvr, epoch = nvre, ""
>+
>+    nvr_re = re.compile(r"^(?P<name>.+)-(?P<version>.+)-(?P<release>.+)$")
>+    nvr_match = nvr_re.match(nvr)
>+
>+    if nvr_match is None:
>+        raise rhnFault(err_code = 21, err_text = "NVRE is missing name, version, or release.")
>+
>+    result = nvr_match.groupdict()
>+    result["epoch"] = epoch
>+
>+    if source and result["release"].endswith(".src"):
>+        result["release"] = result["release"][:-4]
>+
>+    return result
> 
> def subscribe_to_tools_channel(server_id):
>     """

Actions: View | Diff

Attachments on bug 460464: 315196 | 315197 | 319775