summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-18 16:02:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-19 22:15:38 +0100
commit342393587cdc364c12c0a0ba1694f3198cd49158 (patch)
tree7972e53845575e3f1ae73aa481b11e52fcabeef9
parenta09aa675bb8757a677c3f8289b459aa4a064aa34 (diff)
downloadpoky-342393587cdc364c12c0a0ba1694f3198cd49158.tar.gz
dnf: fix "Unable to detect release version" warning
The release version was actually working correctly; it only makes the warning work properly. (From OE-Core rev: e7986a5493ccd222b82c2388ea8c3bb7004b48dd) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch31
-rw-r--r--meta/recipes-devtools/dnf/dnf_2.6.3.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch b/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
new file mode 100644
index 0000000000..05f3141517
--- /dev/null
+++ b/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
@@ -0,0 +1,31 @@
1From 166833a88a928a574bf9143b9b65f544be482c77 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 18 Aug 2017 15:55:15 +0300
4Subject: [PATCH] Check conf.releasever instead of releasever
5
6The substitutions may actually set the conf.releasever correctly,
7and so the check should use that instead of the passed-in function
8parameter.
9
10Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/901]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 dnf/cli/cli.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
17index 2d63420c..167943b8 100644
18--- a/dnf/cli/cli.py
19+++ b/dnf/cli/cli.py
20@@ -914,7 +914,7 @@ class Cli(object):
21 conf.releasever = releasever
22 subst = conf.substitutions
23 subst.update_from_etc(conf.installroot)
24- if releasever is None:
25+ if conf.releasever is None:
26 logger.warning(_("Unable to detect release version (use '--releasever' to specify "
27 "release version)"))
28
29--
302.14.1
31
diff --git a/meta/recipes-devtools/dnf/dnf_2.6.3.bb b/meta/recipes-devtools/dnf/dnf_2.6.3.bb
index 51072901e4..3ed6a74570 100644
--- a/meta/recipes-devtools/dnf/dnf_2.6.3.bb
+++ b/meta/recipes-devtools/dnf/dnf_2.6.3.bb
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
10 file://0001-Do-not-prepend-installroot-to-logdir.patch \ 10 file://0001-Do-not-prepend-installroot-to-logdir.patch \
11 file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \ 11 file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
12 file://0001-Corretly-install-tmpfiles.d-configuration.patch \ 12 file://0001-Corretly-install-tmpfiles.d-configuration.patch \
13 file://0001-Check-conf.releasever-instead-of-releasever.patch \
13 " 14 "
14 15
15SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065" 16SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065"