[PATCH] A bit better parsing of component name from NVR (#741647)

[Jakub Filak]

Signed-off-by: Jakub Filak 
---
 meh/dump.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/meh/dump.py b/meh/dump.py
index e9779f0..0d63d12 100644
--- a/meh/dump.py
+++ b/meh/dump.py
@@ -143,7 +143,20 @@ class ExceptionDump(object):
                         "{0}".format(file_))
             package = "{0}-{1}-{2}.{3}".format(header["name"], header["version"],
                                             header["release"], header["arch"])
-            component = header["sourcerpm"].split("-")[0]
+
+            # cuts the name from the NVR format: foo-blah-2.8.8-2.fc17.src.rpm
+            name_end = len(header["sourcerpm"])
+            try:
+                name_end = nvr.rindex('-')
+            except ValueError as e:
+                pass
+
+            try:
+                name_end = nvr[:name_end].rindex('-')
+            except ValueError as e:
+                pass
+
+            component = header["sourcerpm"][:name_end]

return (package, component)

[Jakub Filak]

Sorry for spamming your inbox, the last email was sent by mistake.

Regards,
Jakub

On Monday 15 of October 2012 14:42:35 Jakub Filak wrote:
> Signed-off-by: Jakub Filak
>
> meh/dump.py | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/meh/dump.py b/meh/dump.py
> index e9779f0..0d63d12 100644
> --- a/meh/dump.py
> +++ b/meh/dump.py
> @@ -143,7 +143,20 @@ class ExceptionDump(object):
>                          "{0}".format(file_))
>              package = "{0}-{1}-{2}.{3}".format(header["name"],
> header["version"], header["release"], header["arch"]) -           
> component = header["sourcerpm"].split("-")[0]
>        # cuts the name from the NVR format:
>
> foo-blah-2.8.8-2.fc17.src.rpm +            name_end =
> len(header["sourcerpm"])
>        try:
>            name_end = nvr.rindex('-')
>        except ValueError as e:
>            pass
>        try:
>            name_end = nvr[:name_end].rindex('-')
>        except ValueError as e:
>            pass
>        component = header["sourcerpm"][:name_end]
>
>        return (package, component)