switch to updated patch
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
parent
ef582340b6
commit
4e5b6f476b
@ -1,6 +1,6 @@
|
|||||||
From e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030 Mon Sep 17 00:00:00 2001
|
From 63aa7db5aad4690b72898d01fa82270c1f503241 Mon Sep 17 00:00:00 2001
|
||||||
From: Patrick Uiterwijk <puiterwijk@redhat.com>
|
From: Patrick Uiterwijk <puiterwijk@redhat.com>
|
||||||
Date: Jan 18 2017 18:50:34 +0000
|
Date: Jan 18 2017 18:52:45 +0000
|
||||||
Subject: Add some debugging about ref updating
|
Subject: Add some debugging about ref updating
|
||||||
|
|
||||||
|
|
||||||
@ -26,4 +26,30 @@ index 1b616b2..68b6d70 100644
|
|||||||
# Let's write the tag out ourselves
|
# Let's write the tag out ourselves
|
||||||
heads_dir = os.path.join(self.repo, 'refs', 'heads')
|
heads_dir = os.path.join(self.repo, 'refs', 'heads')
|
||||||
if not os.path.exists(heads_dir):
|
if not os.path.exists(heads_dir):
|
||||||
|
diff --git a/pungi/ostree/utils.py b/pungi/ostree/utils.py
|
||||||
|
index fb5e330..02540c9 100644
|
||||||
|
--- a/pungi/ostree/utils.py
|
||||||
|
+++ b/pungi/ostree/utils.py
|
||||||
|
@@ -37,8 +37,10 @@ def get_ref_from_treefile(treefile):
|
||||||
|
try:
|
||||||
|
parsed = json.loads(f.read())
|
||||||
|
ref = parsed['ref']
|
||||||
|
- except Exception:
|
||||||
|
- pass
|
||||||
|
+ except Exception as e:
|
||||||
|
+ print('Unable to get ref from treefile: %s' % e)
|
||||||
|
+ else:
|
||||||
|
+ print('Unable to open treefile')
|
||||||
|
return ref
|
||||||
|
|
||||||
|
|
||||||
|
@@ -48,6 +50,8 @@ def get_commitid_from_commitid_file(commitid_file):
|
||||||
|
if os.path.isfile(commitid_file):
|
||||||
|
with open(commitid_file, 'r') as f:
|
||||||
|
commitid = f.read().replace('\n', '')
|
||||||
|
+ else:
|
||||||
|
+ print('Unable to find commitid file')
|
||||||
|
return commitid
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -7,8 +7,8 @@ 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
|
||||||
# from https://pagure.io/fork/puiterwijk/pungi/c/e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030
|
# from https://pagure.io/fork/puiterwijk/pungi/c/63aa7db5aad4690b72898d01fa82270c1f503241
|
||||||
Patch0: e599eb06e2cb8fc3cc3f7a97378a7b7bb5c19030.patch
|
Patch0: 63aa7db5aad4690b72898d01fa82270c1f503241.patch
|
||||||
|
|
||||||
BuildRequires: python-nose, python-mock
|
BuildRequires: python-nose, python-mock
|
||||||
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
|
||||||
|
Loading…
Reference in New Issue
Block a user