New upstream release 4.1.32
This commit is contained in:
parent
512bfad3ef
commit
bb41eeaa3b
@ -1,43 +0,0 @@
|
|||||||
From 5f6dcb37f69734229ce2e94528139640c46583aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
|
||||||
Date: Wed, 5 Dec 2018 11:20:17 +0100
|
|
||||||
Subject: [PATCH] ostree: Send correct ref in the message
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
If configuration requests a different ref than what treefile has, a
|
|
||||||
wrong message can be sent.
|
|
||||||
|
|
||||||
If the treefile is in JSON, the local copy will be updated in-place and
|
|
||||||
it works. However with YAML the updated version is still written as JSON
|
|
||||||
and thus we are still sending the original value.
|
|
||||||
|
|
||||||
Fixes: https://pagure.io/pungi/issue/1092
|
|
||||||
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
|
||||||
---
|
|
||||||
pungi/phases/ostree.py | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py
|
|
||||||
index ae8505ac..8bbe4434 100644
|
|
||||||
--- a/pungi/phases/ostree.py
|
|
||||||
+++ b/pungi/phases/ostree.py
|
|
||||||
@@ -93,8 +93,12 @@ class OSTreeThread(WorkerThread):
|
|
||||||
extra_config_file=extra_config_file)
|
|
||||||
|
|
||||||
if compose.notifier:
|
|
||||||
- ref = get_ref_from_treefile(os.path.join(repodir, config['treefile']),
|
|
||||||
- arch, logger=self.pool._logger)
|
|
||||||
+ original_ref = get_ref_from_treefile(
|
|
||||||
+ os.path.join(repodir, config["treefile"]),
|
|
||||||
+ arch,
|
|
||||||
+ logger=self.pool._logger,
|
|
||||||
+ )
|
|
||||||
+ ref = config.get("ostree_ref") or original_ref
|
|
||||||
# 'pungi-make-ostree tree' writes commitid to commitid.log in
|
|
||||||
# logdir, except if there was no new commit we will get None
|
|
||||||
# instead. If the commit id could not be read, an exception will be
|
|
||||||
--
|
|
||||||
2.17.2
|
|
||||||
|
|
30
pungi.spec
30
pungi.spec
@ -1,13 +1,12 @@
|
|||||||
Name: pungi
|
Name: pungi
|
||||||
Version: 4.1.31
|
Version: 4.1.32
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Distribution compose tool
|
Summary: Distribution compose tool
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://pagure.io/pungi
|
URL: https://pagure.io/pungi
|
||||||
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
|
||||||
Patch0: 0001-ostree-Send-correct-ref-in-the-message.patch
|
|
||||||
|
|
||||||
BuildRequires: python3-nose
|
BuildRequires: python3-nose
|
||||||
BuildRequires: python3-mock
|
BuildRequires: python3-mock
|
||||||
@ -32,11 +31,16 @@ BuildRequires: python3-koji
|
|||||||
BuildRequires: python3-unittest2
|
BuildRequires: python3-unittest2
|
||||||
BuildRequires: lorax
|
BuildRequires: lorax
|
||||||
BuildRequires: python3-PyYAML
|
BuildRequires: python3-PyYAML
|
||||||
|
%if 0%{?fedora} < 30
|
||||||
|
BuildRequires: python3-libmodulemd
|
||||||
|
%else
|
||||||
BuildRequires: python3-libmodulemd1
|
BuildRequires: python3-libmodulemd1
|
||||||
|
%endif
|
||||||
BuildRequires: python3-gobject
|
BuildRequires: python3-gobject
|
||||||
BuildRequires: python3-pdc-client
|
BuildRequires: python3-pdc-client
|
||||||
BuildRequires: python3-createrepo_c
|
BuildRequires: python3-createrepo_c
|
||||||
BuildRequires: python3-dogpile-cache
|
BuildRequires: python3-dogpile-cache
|
||||||
|
BuildRequires: python3-parameterized
|
||||||
|
|
||||||
#deps for doc building
|
#deps for doc building
|
||||||
BuildRequires: python3-sphinx, texlive-collection-fontsrecommended
|
BuildRequires: python3-sphinx, texlive-collection-fontsrecommended
|
||||||
@ -68,7 +72,11 @@ Requires: python3-multilib
|
|||||||
Requires: python3-libcomps
|
Requires: python3-libcomps
|
||||||
Requires: python3-six
|
Requires: python3-six
|
||||||
Requires: python3-koji
|
Requires: python3-koji
|
||||||
|
%if 0%{?fedora} < 30
|
||||||
|
Requires: python3-libmodulemd
|
||||||
|
%else
|
||||||
Requires: python3-libmodulemd1
|
Requires: python3-libmodulemd1
|
||||||
|
%endif
|
||||||
Requires: python3-gobject
|
Requires: python3-gobject
|
||||||
Requires: python3-pdc-client
|
Requires: python3-pdc-client
|
||||||
Requires: python3-createrepo_c
|
Requires: python3-createrepo_c
|
||||||
@ -189,11 +197,27 @@ nosetests-3 --exe
|
|||||||
%{_bindir}/%{name}-config-dump
|
%{_bindir}/%{name}-config-dump
|
||||||
%{_bindir}/%{name}-config-validate
|
%{_bindir}/%{name}-config-validate
|
||||||
%{_bindir}/%{name}-fedmsg-notification
|
%{_bindir}/%{name}-fedmsg-notification
|
||||||
|
%{_bindir}/%{name}-orchestrate
|
||||||
%{_bindir}/%{name}-patch-iso
|
%{_bindir}/%{name}-patch-iso
|
||||||
%{_bindir}/%{name}-compare-depsolving
|
%{_bindir}/%{name}-compare-depsolving
|
||||||
%{_bindir}/%{name}-wait-for-signed-ostree-handler
|
%{_bindir}/%{name}-wait-for-signed-ostree-handler
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 08 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-1
|
||||||
|
- Add script to orchestrate multiple composes (lsedlar)
|
||||||
|
- buildinstall: Expose lorax's --rootfs-size argument (lsedlar)
|
||||||
|
- Support for pungi-legacy with productmd format (frederic.pierret)
|
||||||
|
- Unify update-docs.sh script with rpkg (onosek)
|
||||||
|
- Remove createrepo references from doc and spec (lsedlar)
|
||||||
|
- CreaterepoWrapper: add 'basedir' and 'compress-type' args for createrepo_c
|
||||||
|
(frederic.pierret)
|
||||||
|
- gather.py: use createrepo_c for creating repodata instead of obsolete
|
||||||
|
createrepo python library (frederic.epitre)
|
||||||
|
- Fix import of ConfigParser for NoSectionError and NoOptionError
|
||||||
|
(frederic.pierret)
|
||||||
|
- doc: explain product_id_allow_missing results in detail (kdreyer)
|
||||||
|
- doc: describe product_id's output and purpose (kdreyer)
|
||||||
|
|
||||||
* Wed Dec 12 2018 Stephen Gallagher <sgallagh@redhat.com> - 4.1.31-3
|
* Wed Dec 12 2018 Stephen Gallagher <sgallagh@redhat.com> - 4.1.31-3
|
||||||
- Update dependency for libmodulemd
|
- Update dependency for libmodulemd
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (pungi-4.1.31.tar.bz2) = 6f4eaae274cd48cb0e426838fa3604022fbae85e028d1928ed827ba0c597c0d54d00d1c35570600e081267301d11b2d08a0e2d575a7ba0a4f8afd8991f703de2
|
SHA512 (pungi-4.1.32.tar.bz2) = ea70bfb53d678ce51bd239d368be0728f5e985e6390e4f5ba78326758bc3767c822fb25fc879b40d88ac3cbaf8d6dfe7d2b9fac44dadafe29534c05b43bf9440
|
||||||
|
Loading…
Reference in New Issue
Block a user