From 88cf272df06204bea3b47604e157c08a824d36d6 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 11 Feb 2022 10:02:31 -0800 Subject: [PATCH] [stable-2.12] Fix package-data sanity test for newer setuptools. (cherry picked from commit 3a662ef2c11e7525a251832b329b24c9a1fa1311) Co-authored-by: Matt Clay --- test/sanity/code-smell/package-data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py index 921cb1971fa..06f3f9165e0 100644 --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -223,8 +223,9 @@ def install_sdist(tmp_dir, sdist_dir): raise Exception('sdist install failed:\n%s' % stderr) # Determine the prefix for the installed files - match = re.search('^creating (%s/.*?/(?:site|dist)-packages)/ansible$' % + match = re.search('^copying .* -> (%s/.*?/(?:site|dist)-packages)/ansible$' % tmp_dir, stdout, flags=re.M) + return match.group(1)