New upstream release

This commit is contained in:
Lubomír Sedlář 2019-04-24 13:36:19 +02:00
parent d2d520e989
commit 4ad99eae95
3 changed files with 16 additions and 42 deletions

View File

@ -1,39 +0,0 @@
From 2286c5ccd271af7ae153d29cd5f410c020a6faa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Tue, 26 Mar 2019 14:08:21 +0100
Subject: [PATCH] tests: Stop overwriting modulesdir for DNF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
tests/test_gather.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tests/test_gather.py b/tests/test_gather.py
index 95b768e5..0f6814f1 100644
--- a/tests/test_gather.py
+++ b/tests/test_gather.py
@@ -22,7 +22,6 @@ os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH'])
from pungi.wrappers.pungi import PungiWrapper
try:
- from dnf import __version__ as dnf_version
from pungi.dnf_wrapper import DnfWrapper, Conf
from pungi.gather_dnf import Gather, GatherOptions, PkgFlag
HAS_DNF = True
@@ -1819,10 +1818,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
conf = Conf(base_arch)
conf.persistdir = persistdir
conf.cachedir = self.cachedir
- if int(dnf_version.split('.')[0]) < 3:
- conf.modulesdir = os.path.join(persistdir, 'modules.d')
- else:
- conf.modulesdir._set(os.path.join(persistdir, 'modules.d'))
if exclude:
conf.exclude = exclude
dnf = DnfWrapper(conf)
--
2.17.2

View File

@ -1,14 +1,13 @@
%{?python_enable_dependency_generator}
Name: pungi
Version: 4.1.35
Version: 4.1.36
Release: 1%{?dist}
Summary: Distribution compose tool
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: 0001-tests-Stop-overwriting-modulesdir-for-DNF.patch
BuildRequires: python3-nose
BuildRequires: python3-mock
@ -203,6 +202,20 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Wed Apr 24 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.36-1
- Extend "openssh" runroot_method to be able to execute "mock" (jkaluza)
- osbs: Rework configuration for image pushes (lsedlar)
- Add "openssh" runroot method (jkaluza)
- Fix printing version on Python 3 (lsedlar)
- config-dump: Fix crash when used without --define (lsedlar)
- setup: Fix missing comma in a list (lsedlar)
- setup: Install some deps on Py2.7 only (lsedlar)
- config-dump: Allow defining variables on CLI (lsedlar)
- Update test data (lsedlar)
- gather: Use wildcard for repo selection (lsedlar)
- gather: Apply repo path substitutions for DNF backend (lsedlar)
- tests: Stop overwriting modulesdir for DNF (lsedlar)
* Tue Mar 26 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.35-1
- orchestrator: Monitor status of parts (lsedlar)
- tests: Skip tests if libmodulemd is not available (lsedlar)

View File

@ -1 +1 @@
SHA512 (pungi-4.1.35.tar.bz2) = 6200a23e8fee88b7a67b771fe1189bd0ef6d37b9ee46e93ab811b712690a8ea9816b61b4a4be455d16e05d6c069d4cf8732aed9feb578e37fb8a2a5c82ab489f
SHA512 (pungi-4.1.36.tar.bz2) = 95131adc65c7ca0fc4dc1df71522b1ed158331e5f23edf3f6b39f4c70773dd005473882b7f5251e67a3aae10cc430b71d06bf5af4693a4d9ed2802e2f76b27cf