add patch from Patrick to give us some ostree debuging

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2017-01-18 12:56:04 -06:00
parent 6aede5be20
commit ef582340b6
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Jan 18 2017 18:50:34 +0000
Subject: Add some debugging about ref updating
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
diff --git a/pungi/ostree/tree.py b/pungi/ostree/tree.py
index 1b616b2..68b6d70 100644
--- a/pungi/ostree/tree.py
+++ b/pungi/ostree/tree.py
@@ -63,10 +63,13 @@ class Tree(OSTree):
if self.extra_config:
tag_ref = self.extra_config.get('tag_ref', True)
if not tag_ref:
+ print('Not updating ref as configured')
return
ref = get_ref_from_treefile(self.treefile)
commitid = get_commitid_from_commitid_file(self.commitid_file)
+ print('Ref: %r, Commit ID: %r' % (ref, commitid))
if ref and commitid:
+ print('Updating ref')
# Let's write the tag out ourselves
heads_dir = os.path.join(self.repo, 'refs', 'heads')
if not os.path.exists(heads_dir):

View File

@ -1,12 +1,14 @@
Name: pungi
Version: 4.1.12
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Distribution compose tool
Group: Development/Tools
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
# from https://pagure.io/fork/puiterwijk/pungi/c/e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030
Patch0: e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030.patch
BuildRequires: python-nose, python-mock
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
@ -68,6 +70,7 @@ notification to Fedora Message Bus.
%prep
%setup -q
%patch0 -p1
%build
%{__python} setup.py build
@ -109,6 +112,9 @@ cd tests && ./test_compose.sh
%{_bindir}/%{name}-fedmsg-notification
%changelog
* Tue Jan 17 2017 Dennis Gilmore <dennis@ausil.us> - 4.1.12-2
- add patch from Patrick to give us some ostree debuging
* Tue Jan 17 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.12-1
- unified-iso: Fall back to default config (lsedlar)
- osbs: optionally check GPG signatures (qwan)