New release 4.2.2

This commit is contained in:
Lubomír Sedlář 2020-04-30 09:52:03 +02:00
parent e824989a3e
commit b483eab926
3 changed files with 6 additions and 39 deletions

View File

@ -1,34 +0,0 @@
From 4a7851416249cd2ccc5b20fdeb7adf581204b254 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Mar 16 2020 10:13:02 +0000
Subject: util: Fix regex for detecting debuginfo packages
The `re.match` function already anchors the pattern at the start of the
string, but allows for other characters to continue after match.
This is causing problems with packages like `elfutils-debuginfod-client`
which are not debuginfo.
Let's be safe and explicitly anchor both start and end.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
diff --git a/pungi/util.py b/pungi/util.py
index 21bb0bb..9810899 100644
--- a/pungi/util.py
+++ b/pungi/util.py
@@ -37,7 +37,9 @@ from productmd.common import get_major_version
# Patterns that match all names of debuginfo packages
DEBUG_PATTERNS = ["*-debuginfo", "*-debuginfo-*", "*-debugsource"]
-DEBUG_PATTERN_RE = re.compile(r".*-debuginfo(?:-.*)?|.*-debuginfo-.*|.*-debugsource")
+DEBUG_PATTERN_RE = re.compile(
+ r"^(?:.*-debuginfo(?:-.*)?|.*-debuginfo-.*|.*-debugsource)$"
+)
def _doRunCommand(

View File

@ -1,14 +1,13 @@
%{?python_enable_dependency_generator}
Name: pungi
Version: 4.2.1
Release: 2%{?dist}
Version: 4.2.2
Release: 1%{?dist}
Summary: Distribution compose tool
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: https://pagure.io/pungi/pull-request/1366.patch
BuildRequires: python3-nose
BuildRequires: python3-mock
@ -142,6 +141,9 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Thu Apr 30 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.2-1
- New upstream release
* Mon Mar 16 2020 Lubomír Sedlář <lsedlar@redhat.com> - 4.2.1-2
- Fix false positive debuginfo detection

View File

@ -1,2 +1 @@
SHA512 (pungi-4.2.0.tar.bz2) = 5c9033416e9f7bc2ab6661874ffd8ea9efd144d16bad8fb2ef2d967915c4356ab87ff81b7680d34cbd01121dfd41b36d6a5562b38467be96c76738b18416362c
SHA512 (pungi-4.2.1.tar.bz2) = c3bb4ab5080fdf433e62dfc979d640e6bbd32b11d70f4b2b94351495caf7e687b3ee7f91ad5b328bf1f61bd6d22a0d8a1c9e068116a5e711d2e4a31fb7be0d04
SHA512 (pungi-4.2.2.tar.bz2) = fef4e90d2cdd54a521e2f9509823421885a794ee31d910100305301a74fa4703efa4feac5ee3398e57233767594060b5647d864725ca3f59304ff523b3f8ae5a