From f503a46aa9d6465916b16c1d859716236a60f225a63d2b84fb5e2ef075193126 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 3 May 2023 05:42:18 +0000 Subject: [PATCH] - Add skip_if_buildbot-extend.patch to avoid the bug altogether (extending what skip_if_buildbot covers). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=62 --- python311.changes | 3 ++- python311.spec | 4 ++-- ...reeze_simple_script.patch => skip_if_buildbot-extend.patch | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename skip-test_freeze_simple_script.patch => skip_if_buildbot-extend.patch (87%) diff --git a/python311.changes b/python311.changes index 98fb888..aa6f5b9 100644 --- a/python311.changes +++ b/python311.changes @@ -3,7 +3,8 @@ Sun Apr 30 18:13:16 UTC 2023 - Matej Cepl - Why in the world we download from HTTP? - Add 103213-fetch-CONFIG_ARGS.patch (gh#python/cpython#103053). -- Add skip-test_freeze_simple_script.patch +- Add skip_if_buildbot-extend.patch to avoid the bug altogether + (extending what skip_if_buildbot covers). ------------------------------------------------------------------- Thu Apr 27 21:57:15 UTC 2023 - Matej Cepl diff --git a/python311.spec b/python311.spec index a4b2846..8eeeecb 100644 --- a/python311.spec +++ b/python311.spec @@ -173,9 +173,9 @@ Patch37: CVE-2007-4559-filter-tarfile_extractall.patch # PATCH-FIX-UPSTREAM 103213-fetch-CONFIG_ARGS.patch gh#python/cpython#103053 mcepl@suse.com # Fetch CONFIG_ARGS from original python instance Patch38: 103213-fetch-CONFIG_ARGS.patch -# PATCH-FIX-UPSTREAM skip-test_freeze_simple_script.patch gh#python/cpython#103053 mcepl@suse.com +# PATCH-FIX-UPSTREAM skip_if_buildbot-extend.patch gh#python/cpython#103053 mcepl@suse.com # Skip test_freeze_simple_script -Patch39: skip-test_freeze_simple_script.patch +Patch39: skip_if_buildbot-extend.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes diff --git a/skip-test_freeze_simple_script.patch b/skip_if_buildbot-extend.patch similarity index 87% rename from skip-test_freeze_simple_script.patch rename to skip_if_buildbot-extend.patch index f043185..493ebfe 100644 --- a/skip-test_freeze_simple_script.patch +++ b/skip_if_buildbot-extend.patch @@ -9,7 +9,7 @@ reason = 'not suitable for buildbots' try: - isbuildbot = getpass.getuser().lower() == 'buildbot' -+ isbuildbot = getpass.getuser().lower() == 'abuild' ++ isbuildbot = getpass.getuser().lower() in ['buildbot', 'abuild']: except (KeyError, EnvironmentError) as err: warnings.warn(f'getpass.getuser() failed {err}.', RuntimeWarning) isbuildbot = False