From cfa9a3c63f3877c379b8c7ac014518ad5dbe3993 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Thu, 30 Aug 2018 21:36:37 -0400 Subject: [PATCH] python27: fix tk related dependency generation We don't have tcl/tk, but python likes to ship files which conditionally import tk modules. To avoid pkgdepend from complaining, we bypass dependency generation. For whatever reason, the existing regexes stopped working. --- components/python/python27/python-27-tests.p5m | 2 +- components/python/python27/python-27.p5m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/python/python27/python-27-tests.p5m b/components/python/python27/python-27-tests.p5m index 6b08137d1..fc6d472e1 100644 --- a/components/python/python27/python-27-tests.p5m +++ b/components/python/python27/python-27-tests.p5m @@ -557,7 +557,7 @@ file path=usr/lib/python2.7/test/randv2_32.pck file path=usr/lib/python2.7/test/randv2_64.pck file path=usr/lib/python2.7/test/randv3.pck file path=usr/lib/python2.7/test/re_tests.py -file path=usr/lib/python2.7/test/regrtest.py pkg.depend.bypass-generate=usr/lib/python2.*FixTk.* +file path=usr/lib/python2.7/test/regrtest.py pkg.depend.bypass-generate=.*FixTk.* file path=usr/lib/python2.7/test/relimport.py file path=usr/lib/python2.7/test/reperf.py file path=usr/lib/python2.7/test/revocation.crl diff --git a/components/python/python27/python-27.p5m b/components/python/python27/python-27.p5m index 2937bf1b4..e79ef6deb 100644 --- a/components/python/python27/python-27.p5m +++ b/components/python/python27/python-27.p5m @@ -544,7 +544,7 @@ file path=usr/lib/python2.7/idlelib/ParenMatch.py file path=usr/lib/python2.7/idlelib/PathBrowser.py file path=usr/lib/python2.7/idlelib/Percolator.py file path=usr/lib/python2.7/idlelib/PyParse.py -file path=usr/lib/python2.7/idlelib/PyShell.py pkg.depend.bypass-generate=usr/lib/python2.*(Tkinter|tkMessage).* +file path=usr/lib/python2.7/idlelib/PyShell.py pkg.depend.bypass-generate=.*(Tkinter|tkMessage).* file path=usr/lib/python2.7/idlelib/README.txt file path=usr/lib/python2.7/idlelib/RemoteDebugger.py file path=usr/lib/python2.7/idlelib/RemoteObjectBrowser.py @@ -875,7 +875,7 @@ file path=usr/lib/python2.7/pstats.py file path=usr/lib/python2.7/pty.py file path=usr/lib/python2.7/py_compile.py file path=usr/lib/python2.7/pyclbr.py -file path=usr/lib/python2.7/pydoc.py pkg.depend.bypass-generate=usr/lib/python2.*Tkinter.* +file path=usr/lib/python2.7/pydoc.py pkg.depend.bypass-generate=.*Tkinter.* file path=usr/lib/python2.7/pydoc_data/__init__.py file path=usr/lib/python2.7/pydoc_data/topics.py file path=usr/lib/python2.7/quopri.py -- 2.11.4.GIT