From b9d0a95ac4e95e681acff5fda6d2ca2c085d9f38 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jul 26 2017 07:27:01 +0000 Subject: [PATCH 1/3] handle debugsource same way as debuginfo packages Signed-off-by: Igor Gnatenko --- diff --git a/koji/__init__.py b/koji/__init__.py index 835d96a..f93e10d 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1052,7 +1052,8 @@ def _check_NVRA(nvra): def is_debuginfo(name): """Determines if an rpm is a debuginfo rpm, based on name""" - if name.endswith('-debuginfo') or name.find('-debuginfo-') != -1: + if name.endswith('-debuginfo') or name.endswith('-debugsource') or \ + name.find('-debuginfo-') != -1: return True return False From 9df2d273f2543cab41eced8ac9ff641694da67ed Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jul 26 2017 07:29:22 +0000 Subject: [PATCH 2/3] use if 'x' in s instead of str.find() It's more readable. Signed-off-by: Igor Gnatenko --- diff --git a/koji/__init__.py b/koji/__init__.py index f93e10d..7368f55 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1053,7 +1053,7 @@ def _check_NVRA(nvra): def is_debuginfo(name): """Determines if an rpm is a debuginfo rpm, based on name""" if name.endswith('-debuginfo') or name.endswith('-debugsource') or \ - name.find('-debuginfo-') != -1: + '-debuginfo-' in name: return True return False From 8aa101307fb56b483902470cf3c8035a944e7a50 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Aug 01 2017 07:03:26 +0000 Subject: [PATCH 3/3] make is_debuginfo() one-line Signed-off-by: Igor Gnatenko --- diff --git a/koji/__init__.py b/koji/__init__.py index 7368f55..fc187f6 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1052,10 +1052,8 @@ def _check_NVRA(nvra): def is_debuginfo(name): """Determines if an rpm is a debuginfo rpm, based on name""" - if name.endswith('-debuginfo') or name.endswith('-debugsource') or \ - '-debuginfo-' in name: - return True - return False + return (name.endswith('-debuginfo') or name.endswith('-debugsource') or + '-debuginfo-' in name) def canonArch(arch): """Given an arch, return the "canonical" arch"""