[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6469/8267] dnf: update to 2.5.1

[Emmanuele Bassi <ebassi src gnome org>]

commit f74fd6dbcc664b4f902e5c88cee835f9877dde45
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Wed Jun 21 15:58:20 2017 +0300

    dnf: update to 2.5.1
    
    Drop 0001-Revert-proper-check-of-releasever-when-using-install.patch
    as the problem has been solved upstream.
    
    Add 0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch,
    as the warning for missing releasever is issued prematurely in our case.
    
    (From OE-Core rev: 68b01f9fe239aa224daa8dc901fa3cf0350261c0)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...ever-check-after-the-etc-dnf-vars-substit.patch |   37 +++++++
 ...er-check-of-releasever-when-using-install.patch |  105 --------------------
 .../dnf/{dnf_git.bb => dnf_2.5.1.bb}               |    5 +-
 3 files changed, 39 insertions(+), 108 deletions(-)
---
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch 
b/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
new file mode 100644
index 0000000..0226d4f
--- /dev/null
+++ b/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
@@ -0,0 +1,37 @@
+From 3d0cdd8af1b415712eeb00e377c307001684ad06 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex kanavin gmail com>
+Date: Wed, 21 Jun 2017 15:35:20 +0300
+Subject: [PATCH] Move releasever check after the etc/dnf/vars substitutions.
+
+The substitutions may actually set the releasever correctly,
+and so the check is premature.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex kanavin gmail com>
+---
+ dnf/cli/cli.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
+index c53c2a52..f9f2c13a 100644
+--- a/dnf/cli/cli.py
++++ b/dnf/cli/cli.py
+@@ -882,12 +882,12 @@ class Cli(object):
+             releasever = dnf.rpm.detect_releasever(conf.installroot)
+         elif releasever == '/':
+             releasever = dnf.rpm.detect_releasever(releasever)
+-        if releasever is None:
+-            logger.warning(_("Unable to detect release version (use '--releasever' to specify "
+-                             "release version)"))
+         conf.releasever = releasever
+         subst = conf.substitutions
+         subst.update_from_etc(conf.installroot)
++        if releasever is None:
++            logger.warning(_("Unable to detect release version (use '--releasever' to specify "
++                             "release version)"))
+ 
+         for opt in ('cachedir', 'logdir', 'persistdir'):
+             conf.prepend_installroot(opt)
+-- 
+2.11.0
+
diff --git a/meta/recipes-devtools/dnf/dnf_git.bb b/meta/recipes-devtools/dnf/dnf_2.5.1.bb
similarity index 94%
rename from meta/recipes-devtools/dnf/dnf_git.bb
rename to meta/recipes-devtools/dnf/dnf_2.5.1.bb
index c975900..cdc2a85 100644
--- a/meta/recipes-devtools/dnf/dnf_git.bb
+++ b/meta/recipes-devtools/dnf/dnf_2.5.1.bb
@@ -5,16 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    "
 
 SRC_URI = "git://github.com/rpm-software-management/dnf.git \
+           file://0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch \
            file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
            file://0030-Run-python-scripts-using-env.patch \
            file://0001-Do-not-prepend-installroot-to-logdir.patch \
            file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
            file://0001-Corretly-install-tmpfiles.d-configuration.patch \
-           file://0001-Revert-proper-check-of-releasever-when-using-install.patch \
            "
 
-PV = "2.3.0"
-SRCREV = "242079563b54b4714c889fd4ee32e8dd9960f3b8"
+SRCREV = "32e6ffdc8902b868cd8f98f9c399c98c9de0c7b8"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"