Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20929494 python 2.7 dependency on tkinter should be conditional s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 22 Apr 2015 07:27:42 -0700
branchs11-update
changeset 4171 2e163eeb727a
parent 4170 736251b9f880
child 4172 a6d468ddeb77
20929494 python 2.7 dependency on tkinter should be conditional
components/python/python27/python-27.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/python27/python-27.p5m	Wed Apr 22 12:46:20 2015 -0700
+++ b/components/python/python27/python-27.p5m	Wed Apr 22 07:27:42 2015 -0700
@@ -568,7 +568,9 @@
 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
+# pkgdepend would (incorrectly) turn our conditional dependency on tkinter
+# into a require dependency.
+file path=usr/lib/python2.7/idlelib/PyShell.py pkg.depend.bypass-generate=.*
 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
@@ -904,7 +906,9 @@
 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
+# pkgdepend would (incorrectly) turn our conditional dependency on tkinter
+# into a require dependency.
+file path=usr/lib/python2.7/pydoc.py pkg.depend.bypass-generate=.*
 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
upstream/oracle/userland-gate