summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch')
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch37
1 files changed, 0 insertions, 37 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
deleted file mode 100644
index daf058bbae..0000000000
--- a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 3d0cdd8af1b415712eeb00e377c307001684ad06 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 21 Jun 2017 15:35:20 +0300
4Subject: [PATCH] Move releasever check after the etc/dnf/vars substitutions.
5
6The substitutions may actually set the releasever correctly,
7and so the check is premature.
8
9Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/868]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 dnf/cli/cli.py | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
16index c53c2a52..f9f2c13a 100644
17--- a/dnf/cli/cli.py
18+++ b/dnf/cli/cli.py
19@@ -882,12 +882,12 @@ class Cli(object):
20 releasever = dnf.rpm.detect_releasever(conf.installroot)
21 elif releasever == '/':
22 releasever = dnf.rpm.detect_releasever(releasever)
23- if releasever is None:
24- logger.warning(_("Unable to detect release version (use '--releasever' to specify "
25- "release version)"))
26 conf.releasever = releasever
27 subst = conf.substitutions
28 subst.update_from_etc(conf.installroot)
29+ if releasever is None:
30+ logger.warning(_("Unable to detect release version (use '--releasever' to specify "
31+ "release version)"))
32
33 for opt in ('cachedir', 'logdir', 'persistdir'):
34 conf.prepend_installroot(opt)
35--
362.11.0
37