From 3c560d0c68ff1f2cffbb2abd53fab52dc09e415c Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Mon, 23 Apr 2018 18:54:46 -0500 Subject: [PATCH 1/2] osclib/core: package_binary_list(): provide exclude_src_debug option. --- osclib/core.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/osclib/core.py b/osclib/core.py index 34b7e638..a3eb9e71 100644 --- a/osclib/core.py +++ b/osclib/core.py @@ -121,7 +121,7 @@ def binary_list(apiurl, project, repository, arch, package=None): return parsed @memoize(session=True) -def package_binary_list(apiurl, project, repository, arch, package=None): +def package_binary_list(apiurl, project, repository, arch, package=None, exclude_src_debug=False): path = ['build', project, repository, arch] if package: path.append(package) @@ -140,12 +140,23 @@ def package_binary_list(apiurl, project, repository, arch, package=None): if not result: continue - package_binaries.append(BinaryParsed(package, result.group('filename'), - result.group('name'), result.group('arch'))) + binary = BinaryParsed(package, result.group('filename'), + result.group('name'), result.group('arch')) + if exclude_src_debug and binary_src_debug(binary): + continue + + package_binaries.append(binary) binary_map[result.group('filename')] = package return package_binaries, binary_map +def binary_src_debug(binary): + return ( + binary.arch == 'src' or + binary.name.endswith('-debuginfo') or + binary.name.endswith('-debugsource') + ) + @memoize(session=True) def devel_project_get(apiurl, target_project, target_package): try: From d65e037d18380b520cd97de18b43378e93fafca9 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Mon, 23 Apr 2018 18:56:41 -0500 Subject: [PATCH 2/2] unmaintained: utilize package_binary_list(exclude_src_debug). --- unmaintained.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unmaintained.py b/unmaintained.py index d4bf43e9..0f3b4b53 100755 --- a/unmaintained.py +++ b/unmaintained.py @@ -29,9 +29,9 @@ def unmaintained(apiurl, project_target): lookup = {k: v for k, v in lookup.iteritems() if v.startswith('SUSE:SLE')} package_binaries, _ = package_binary_list( - apiurl, project_target, 'standard', 'x86_64') + apiurl, project_target, 'standard', 'x86_64', exclude_src_debug=True) package_binaries_total = len(package_binaries) - package_binaries = [pb for pb in package_binaries if pb.arch != 'src' and pb.package in lookup] + package_binaries = [pb for pb in package_binaries if pb.package in lookup] # Determine max length possible for each column. maxes = [