[Lldb-commits] [PATCH] D29405: Install six.py copy into subdirectory lldb

[Kamil Rytarowski via Phabricator via lldb-commits]

krytarowski created this revision.
krytarowski added a project: LLDB.

The current version of LLDB installs six.py into global python library directory. This approach produces conflicts downstream with distribution's py-six copy.

Install six.py into subdirectory as this is a common way of handling this library in other projects.

As short list (extracted from pkgsrc) is as follows:

- math/py-scipy/PLIST:${PYSITELIB}/scipy/_lib/six.py
- misc/calibre1/PLIST:lib/calibre/six.py
- net/py-dropbox/PLIST:${PYSITELIB}/dropbox/six.py
- net/py-google-cloud-sdk/PLIST:${PYPKGPREFIX}-google-cloud-sdk/lib/third_party/requests/packages/urllib3/packages/six.py
- net/py-google-cloud-sdk/PLIST:${PYPKGPREFIX}-google-cloud-sdk/platform/gsutil/third_party/boto/boto/vendored/six.py
- net/py-google-cloud-sdk/PLIST:${PYPKGPREFIX}-google-cloud-sdk/platform/gsutil/third_party/six/six.py
- print/hplip/PLIST.base:share/hplip/base/six.py

www/py-django/PLIST:${PYSITELIB}/django/utils/six.py

and others.

Downstream projects still can deduplicate a local copy on demand, other ones can stop patching LLDB in order to create a package.


Repository:
  rL LLVM

https://reviews.llvm.org/D29405

Files:
  packages/Python/lldbsuite/pre_kill_hook/darwin.py
  packages/Python/lldbsuite/pre_kill_hook/tests/test_darwin.py
  packages/Python/lldbsuite/pre_kill_hook/tests/test_linux.py
  packages/Python/lldbsuite/support/encoded_file.py
  packages/Python/lldbsuite/support/seven.py
  packages/Python/lldbsuite/test/api/listeners/TestListener.py
  packages/Python/lldbsuite/test/decorators.py
  packages/Python/lldbsuite/test/dosep.py
  packages/Python/lldbsuite/test/dotest.py
  packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
  packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
  packages/Python/lldbsuite/test/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
  packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
  packages/Python/lldbsuite/test/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py
  packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
  packages/Python/lldbsuite/test/lldbcurses.py
  packages/Python/lldbsuite/test/lldbpexpect.py
  packages/Python/lldbsuite/test/lldbplatform.py
  packages/Python/lldbsuite/test/lldbplatformutil.py
  packages/Python/lldbsuite/test/lldbtest.py
  packages/Python/lldbsuite/test/lldbutil.py
  packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
  packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
  packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
  packages/Python/lldbsuite/test_event/dotest_channels.py
  packages/Python/lldbsuite/test_event/formatter/pickled.py
  packages/Python/lldbsuite/test_event/formatter/xunit.py
  packages/Python/lldbsuite/test_event/test/src/event_collector.py
  scripts/Python/finishSwigPythonLLDB.py
  scripts/lldb.swig
  source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
  third_party/Python/module/progress/progress.py
  third_party/Python/module/unittest2/unittest2/case.py
  third_party/Python/module/unittest2/unittest2/main.py
  third_party/Python/module/unittest2/unittest2/result.py
  third_party/Python/module/unittest2/unittest2/suite.py
  third_party/Python/module/unittest2/unittest2/test/test_case.py
  third_party/Python/module/unittest2/unittest2/test/test_functiontestcase.py

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29405.86670.patch
Type: text/x-patch
Size: 16511 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20170201/a77b4832/attachment-0001.bin>