Attachment 865115 Details for Bug 1067063 – changes the version checking logic for createrepo

[patch] changes the version checking logic for createrepo

mrepo.patch (text/plain), 1.14 KB, created by Romke van Dijk on 2014-02-19 15:22:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romke van Dijk

Created: 2014-02-19 15:22:43 UTC

Size: 1.14 KB

patch

obsolete

>--- /usr/bin/mrepo      2014-02-19 15:22:42.435345016 +0100
>+++ /usr/bin/mrepo      2014-02-19 15:23:17.886340046 +0100
>@@ -813,14 +813,20 @@
>         ### Find the createrepo version we are using (due to groupfile usage changes)
>         createrepo_version = None
>         groupfilename = 'RPMS.%s/comps.xml' % self.name
>+
>+        sys.path.append("/usr/share/createrepo")
>         try:
>-            sys.path.append("/usr/share/createrepo")
>-            import genpkgmetadata
>-            createrepo_version = genpkgmetadata.__version__
>-            sys.path.remove("/usr/share/createrepo")
>-            del genpkgmetadata
>-        except:
>+            try:
>+                import createrepo
>+                createrepo_version = createrepo.__version__
>+                del createrepo
>+            except ImportError:
>+                import genpkgmetadata
>+                createrepo_version = genpkgmetadata.__version__
>+                del genpkgmetadata
>+        except ImportError:
>             pass
>+        sys.path.remove("/usr/share/createrepo")
>
>         ### If version < 0.4.6, then use the old createrepo behaviour
>         if not createrepo_version:

Actions: View | Diff

Attachments on bug 1067063: 865115