simplestreams

Merge lp:~gz/simplestreams/setup_user_install into lp:~smoser/simplestreams/trunk

  1. setup_user_install
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Merged at revision: 361
Proposed branch: lp:~gz/simplestreams/setup_user_install
Merge into: lp:~smoser/simplestreams/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
setup.py (+2/-2)
To merge this branch: bzr merge lp:~gz/simplestreams/setup_user_install
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+242248@code.launchpad.net

Description of the change

Make `python setup.py install --user` work

Changes absolute paths in setup.py data_files to relative paths, so they end up in /usr or ~/.local as appropriate.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2013-06-28 20:29:00 +0000
3+++ setup.py 2014-11-19 18:20:32 +0000
4@@ -21,8 +21,8 @@
5 'simplestreams.objectstores'],
6 scripts=glob('bin/*'),
7 data_files=[
8- ('/usr/lib/simplestreams', glob('tools/hook-*')),
9- ('/usr/share/doc/simplestreams',
10+ ('lib/simplestreams', glob('tools/hook-*')),
11+ ('share/doc/simplestreams',
12 [f for f in glob('doc/*') if is_f(f)]),
13 ]
14 )

Subscribers

People subscribed via source and target branches

to all changes: