Merge lp:~dobey/ubuntuone-storage-protocol/fix-570249 into lp:ubuntuone-storage-protocol

Proposed by dobey
Status: Merged
Approved by: Tim Cole
Approved revision: 97
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/fix-570249
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 21 lines (+3/-4)
1 file modified
setup.py (+3/-4)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/fix-570249
Reviewer Review Type Date Requested Status
Tim Cole (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+24167@code.launchpad.net

Commit message

Remove the namespace_packages list
Small indentation fix

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks nice!

review: Approve
Revision history for this message
Tim Cole (tcole) :
review: Approve

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 2010-04-21 14:35:36 +0000
3+++ setup.py 2010-04-26 20:44:18 +0000
4@@ -124,14 +124,13 @@
5 version='1.3',
6 packages=['ubuntuone',
7 'ubuntuone.storageprotocol'],
8- data_files=[(ssl_cert_location,
9- ['data/UbuntuOne-Go_Daddy_CA.pem',
10- 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
11+ data_files=[(ssl_cert_location,
12+ ['data/UbuntuOne-Go_Daddy_CA.pem',
13+ 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
14
15 cmdclass = {
16 'build' : StorageProtocolBuild,
17 'clean' : StorageProtocolClean,
18 'check' : StorageProtocolCheck
19 },
20- namespace_packages = ['ubuntuone'],
21 )

Subscribers

People subscribed via source and target branches