Blame 0001-DNF-3-config-substitutions-moved-from-dnf-to-libdnf.patch
|
Adam Williamson |
3c1aff |
From 73e1d130538ea4cdca2dfd6a273cb3f9ac092934 Mon Sep 17 00:00:00 2001
|
|
Adam Williamson |
3c1aff |
From: Adam Williamson <awilliam@redhat.com>
|
|
Adam Williamson |
3c1aff |
Date: Tue, 26 Jun 2018 11:53:22 -0700
|
|
Adam Williamson |
3c1aff |
Subject: [PATCH 1/3] DNF 3: config substitutions moved from dnf to libdnf
|
|
Adam Williamson |
3c1aff |
|
|
Adam Williamson |
3c1aff |
This just moved from dnf.conf to libdnf.conf, no big problem.
|
|
Adam Williamson |
3c1aff |
|
|
Adam Williamson |
3c1aff |
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
Adam Williamson |
3c1aff |
---
|
|
Adam Williamson |
3c1aff |
pyanaconda/payload/dnfpayload.py | 4 ++--
|
|
Adam Williamson |
3c1aff |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Adam Williamson |
3c1aff |
|
|
Adam Williamson |
3c1aff |
diff --git a/pyanaconda/payload/dnfpayload.py b/pyanaconda/payload/dnfpayload.py
|
|
Adam Williamson |
3c1aff |
index dee3903eb..8b8be68c9 100644
|
|
Adam Williamson |
3c1aff |
--- a/pyanaconda/payload/dnfpayload.py
|
|
Adam Williamson |
3c1aff |
+++ b/pyanaconda/payload/dnfpayload.py
|
|
Adam Williamson |
3c1aff |
@@ -54,7 +54,7 @@ import dnf.logging
|
|
Adam Williamson |
3c1aff |
import dnf.exceptions
|
|
Adam Williamson |
3c1aff |
import dnf.repo
|
|
Adam Williamson |
3c1aff |
import dnf.callback
|
|
Adam Williamson |
3c1aff |
-import dnf.conf.parser
|
|
Adam Williamson |
3c1aff |
+import libdnf.conf
|
|
Adam Williamson |
3c1aff |
import dnf.conf.substitutions
|
|
Adam Williamson |
3c1aff |
import rpm
|
|
Adam Williamson |
3c1aff |
import librepo
|
|
Adam Williamson |
3c1aff |
@@ -325,7 +325,7 @@ class DNFPayload(payload.PackagePayload):
|
|
Adam Williamson |
3c1aff |
Currently supports $releasever and $basearch.
|
|
Adam Williamson |
3c1aff |
"""
|
|
Adam Williamson |
3c1aff |
if url:
|
|
Adam Williamson |
3c1aff |
- return dnf.conf.parser.substitute(url, self._base.conf.substitutions)
|
|
Adam Williamson |
3c1aff |
+ return libdnf.conf.ConfigParser.substitute(url, self._base.conf.substitutions)
|
|
Adam Williamson |
3c1aff |
|
|
Adam Williamson |
3c1aff |
return None
|
|
Adam Williamson |
3c1aff |
|
|
Adam Williamson |
3c1aff |
--
|
|
Adam Williamson |
3c1aff |
2.18.0.rc2
|
|
Adam Williamson |
3c1aff |
|