[Fedora-livecd-list] Branch 'f19-branch' - imgcreate/yuminst.py

[Bruno Wolff III]

 imgcreate/yuminst.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4b311ef489943524242e2b340f6b4dd29bdc19a
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Dec 21 13:27:19 2013 -0600

    Fix to work with the changed yum.config._getsysver
    
    Sometime after 3.4.3-106 yum.config._getsysver was changed so that
    its second argument is a list of strings instead of a single string.
    The default for yum itself is "system-release(release)", "redhat-release",
    so it seems like that would be good to use for livecd-tools.
    
    This should fix bug 1044675.

diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py
index ea44737..0865b31 100644
--- a/imgcreate/yuminst.py
+++ b/imgcreate/yuminst.py
@@ -158,7 +158,7 @@ class LiveCDYum(yum.YumBase):
                     option = option.replace("$releasever", self.releasever)
                 else:
                     try:
-                        option = option.replace("$releasever", yum.config._getsysver("/", "redhat-release"))
+                        option = option.replace("$releasever", yum.config._getsysver("/", ("system-release(release), "redhat-release")))
                     except yum.Errors.YumBaseError:
                         raise CreatorError("$releasever in repo url, but no releasever set")
             return option