From 2517c8653874086a96e637318f12b9ebc36f1a62 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 16 2017 17:18:40 +0000 Subject: Drop the patch 438 --- diff --git a/438.patch b/438.patch deleted file mode 100644 index a18b559..0000000 --- a/438.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 290c14444af2a46d0258e5d0c953bb1443a2afb1 Mon Sep 17 00:00:00 2001 -From: Patrick Uiterwijk -Date: Wed, 31 May 2017 19:35:42 +0200 -Subject: [PATCH] Deal with broken COPR messages - -The "pkg" value suddenly switched from N-V-R to just name, with no -idea how to determine whether it is or not. - -This patch is very obnoxious. -I want the COPR guys to get it fixed and consider their changes to -message format vs fedmsg-meta. - -Signed-off-by: Patrick Uiterwijk ---- - fedmsg_meta_fedora_infrastructure/coprs.py | 9 +++- - fedmsg_meta_fedora_infrastructure/tests/coprs.py | 61 ++++++++++++++++++++++++ - 2 files changed, 68 insertions(+), 2 deletions(-) - -diff --git a/fedmsg_meta_fedora_infrastructure/coprs.py b/fedmsg_meta_fedora_infrastructure/coprs.py -index 221f23e..d860b3b 100644 ---- a/fedmsg_meta_fedora_infrastructure/coprs.py -+++ b/fedmsg_meta_fedora_infrastructure/coprs.py -@@ -84,8 +84,13 @@ def long_form(self, msg, **config): - # Zero pad buildid - kwargs['build'] = '%08d' % (kwargs['build']) - -- # Also, extract the name from the NVR. -- name, version, release = kwargs['pkg'].rsplit('-', 2) -+ if '-' not in kwargs['version']: -+ # This has happened. -+ # Example: 2017-c1e242e3-3a1c-4de9-8d37-61640b5e99fa -+ name = '?? WHO KNOWS ??' -+ else: -+ # Also, extract the name from the NVR. -+ name, version, release = kwargs['pkg'].rsplit('-', 2) - kwargs['pkg_name'] = name - - details = _long_template.format(**kwargs) -diff --git a/fedmsg_meta_fedora_infrastructure/tests/coprs.py b/fedmsg_meta_fedora_infrastructure/tests/coprs.py -index 1b95a78..4bc8805 100644 ---- a/fedmsg_meta_fedora_infrastructure/tests/coprs.py -+++ b/fedmsg_meta_fedora_infrastructure/tests/coprs.py -@@ -42,6 +42,22 @@ - """ - - -+_long_copr_end_broken = """Package: mutt-kz-1.5.23.1 -+COPR: fatka/mutt-kz -+Built by: fatka -+Status: success -+ID: 00000100 -+ -+Logs: -+ Build: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/00000100-?? WHO KNOWS ??/build.log.gz -+ Root: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/00000100-?? WHO KNOWS ??/root.log.gz -+ Copr: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/build-00000100.log -+ Mockchain: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/00000100-?? WHO KNOWS ??/mockchain.log.gz -+Results: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/00000100-?? WHO KNOWS ??/ -+Repodata: https://copr-be.cloud.fedoraproject.org/results/fatka/mutt-kz/fedora-20-x86_64/repodata/ -+""" -+ -+ - _long_copr_end_fail = """Package: glib2-2.42.2-1.01.fc21 - COPR: brianjmurrell/glib2 - Built by: brianjmurrell -@@ -140,6 +156,51 @@ class TestCoprsBuildEnd(Base): - } - - -+class TestCoprsBuildEndBrokenNOVR(Base): -+ """ `Copr `_ publishes these messages -+ when a build has completed. This is an example of a build that **completed -+ successfully**. -+ """ -+ expected_title = "copr.build.end" -+ expected_subti = ( -+ "fatka's mutt-kz copr build of " -+ "mutt-kz-1.5.23.1 " -+ "for fedora-20-x86_64 finished with 'success'") -+ expected_long_form = _long_copr_end_broken -+ expected_secondary_icon = ( -+ 'https://seccdn.libravatar.org/avatar/' -+ 'b9d974c03597da48d9c3b11d4423bf30c6e0c01c23bcd3a192167a95f7c506bc?' -+ 's=64&d=retro') -+ expected_packages = set([]) -+ expected_usernames = set(['fatka']) -+ expected_objects = set([ -+ 'coprs/mutt-kz/build.end', -+ ]) -+ expected_link = ( -+ "https://copr.fedoraproject.org/coprs/fatka/mutt-kz/build/100/") -+ msg = { -+ u'username': u'copr', -+ u'i': 4, -+ u'timestamp': 1383956707.6340001, -+ u'msg_id': u'2013-b05a323d-37ee-4396-9635-7b5dfaf5441b', -+ u'topic': u'org.fedoraproject.prod.copr.build.end', -+ u'msg': { -+ u'status': 1, -+ u'chroot': u'fedora-20-x86_64', -+ u'what': u'build end: user:fatka copr:mutt-kz build:100 ' -+ 'ip:172.16.3.3 pid:12010 status:1', -+ u'ip': u'172.16.3.3', -+ u'who': u'worker-2', -+ u'pid': 12010, -+ u'copr': u'mutt-kz', -+ u'version': '1.5.23.1', -+ u'pkg': 'mutt-kz', -+ u'build': 100, -+ u'user': u'fatka', -+ }, -+ } -+ -+ - class TestCoprsBuildFailure(Base): - """ `Copr `_ publishes these messages - when a build has completed. This is an example of a build that **failed**. diff --git a/python-fedmsg-meta-fedora-infrastructure.spec b/python-fedmsg-meta-fedora-infrastructure.spec index 03f054d..edeee36 100644 --- a/python-fedmsg-meta-fedora-infrastructure.spec +++ b/python-fedmsg-meta-fedora-infrastructure.spec @@ -20,12 +20,9 @@ License: LGPLv2+ URL: http://pypi.python.org/pypi/%{modname} Source0: http://pypi.python.org/packages/source/f/%{modname}/%{modname}-%{version}.tar.gz -# https://github.com/fedora-infra/fedmsg_meta_fedora_infrastructure/pull/438 -Patch0: 438.patch - BuildArch: noarch -BuildRequires: git +#BuildRequires: git-core BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-fedmsg-core @@ -99,7 +96,8 @@ Fedora Infrastructure . %endif %prep -%autosetup -n %{modname}-%{version} -S git +%autosetup -n %{modname}-%{version} +#-S git # Remove bundled egg-info in case it exists rm -rf %{modname}.egg-info