almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

[ostree] Put variant name in ostree log dir (lsedlar)

Browse Source 
- Merge #294 `[ostree] Initialize empty repo` (dennis)
- [util] Resolve git+https URLs (lsedlar)
- [ostree] Initialize empty repo (lsedlar)
- [test] Add checks for created images (lsedlar)
- Fix caching global ksurl (lsedlar)
- include tests/fixtures in manifest (dennis)

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-05-16 21:00:11 -05:00
parent f5fcadc9bb
commit c6de2d8114
3 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Fix-caching-global-ksurl.patch
View File

@ -1,34 +0,0 @@
From 5aadf4ac39d85eeee969d7f3edd474e170a0c86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Thu, 5 May 2016 10:44:27 +0200
Subject: [PATCH] Fix caching global ksurl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The config object from Kobo does not allow keys starting with
underscore, so we prefix it with `private_` instead.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
pungi/phases/base.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pungi/phases/base.py b/pungi/phases/base.py
index 18d6f8a..6e24249 100644
--- a/pungi/phases/base.py
+++ b/pungi/phases/base.py
@@ -145,7 +145,7 @@ class ImageConfigMixin(object):
def global_ksurl(self):
"""Get global ksurl setting, making sure to resolve it only once."""
# The global setting is cached in the configuration object.
- if '_global_ksurl' not in self.compose.conf:
+ if 'private_global_ksurl' not in self.compose.conf:
ksurl = self.compose.conf.get('global_ksurl')
- self.compose.conf['_global_ksurl'] = util.resolve_git_url(ksurl)
- return self.compose.conf['_global_ksurl']
+ self.compose.conf['private_global_ksurl'] = util.resolve_git_url(ksurl)
+ return self.compose.conf['private_global_ksurl']
--
2.7.4

15
pungi.spec
View File

@ -1,13 +1,12 @@
Name: pungi
Version: 4.1.4
Release: 2%{?dist}
Version: 4.1.5
Release: 1%{?dist}
Summary: Distribution compose tool
Group: Development/Tools
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
Patch0: 0001-Fix-caching-global-ksurl.patch
BuildRequires: python-nose, python-nose-cov, python-mock
BuildRequires: python-devel, python-setuptools, python2-productmd
@ -49,7 +48,6 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
%prep
%setup -q
%patch0 -p1
%build
%{__python} setup.py build
@ -85,6 +83,15 @@ cd tests && ./test_compose.sh
/var/cache/pungi
%changelog
* Mon May 16 2016 Dennis Gilmore <dennis@ausil.us> - 4.1.5-1
- [ostree] Put variant name in ostree log dir (lsedlar)
- Merge #294 `[ostree] Initialize empty repo` (dennis)
- [util] Resolve git+https URLs (lsedlar)
- [ostree] Initialize empty repo (lsedlar)
- [test] Add checks for created images (lsedlar)
- Fix caching global ksurl (lsedlar)
- include tests/fixtures in manifest (dennis)
* Fri May 06 2016 Dennis Gilmore <dennis@ausil.us> - 4.1.4-2
- add patch to fix caching global ksurl

2
sources
View File

@ -1 +1 @@
f99681cf108f781bd71885fe87433b5b pungi-4.1.4.tar.bz2
9b9b0d74ece1d0479b90350315197e5e pungi-4.1.5.tar.bz2