Get message from LogRecord with a method

This commit is contained in:
Lubomír Sedlář 2019-11-08 15:27:11 +01:00
parent 34edeec8b4
commit c373fbebc0
2 changed files with 31 additions and 1 deletions

26
1292.patch Normal file
View File

@ -0,0 +1,26 @@
From cc0e7af866ec260126ec11aee68353bad590493f Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Nov 08 2019 14:24:15 +0000
Subject: Get message from LogRecord with a method
Relates: https://pagure.io/releng/failed-composes/issue/469
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
diff --git a/pungi/compose.py b/pungi/compose.py
index ade5df2..84f2212 100644
--- a/pungi/compose.py
+++ b/pungi/compose.py
@@ -137,7 +137,8 @@ class Compose(kobo.log.LoggingBase):
class ExcludingArchLogFilter(logging.Filter):
def filter(self, record):
- if 'Populating package set for arch:' in record.message or \
+ message = record.getMessage()
+ if 'Populating package set for arch:' in message or \
(record.funcName and record.funcName == 'is_excluded'):
return True
else:

View File

@ -2,12 +2,13 @@
Name: pungi
Version: 4.1.40
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Distribution compose tool
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch1: https://pagure.io/pungi/pull-request/1292.patch
BuildRequires: python3-nose
BuildRequires: python3-mock
@ -141,6 +142,9 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Fri Nov 08 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-2
- Get message from LogRecord with a method
* Wed Oct 23 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.40-1
- pkgset: Only reuse valid old repo (lsedlar)
- Clean up skipping phases (hlin)