Merge lp:~nataliabidart/magicicada-server/protocol-link-magicicada-protocol into lp:magicicada-server

Proposed by Natalia Bidart on 2018-04-13
Status: Merged
Approved by: Natalia Bidart on 2018-04-13
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~nataliabidart/magicicada-server/protocol-link-magicicada-protocol
Merge into: lp:magicicada-server
Diff against target: 15 lines (+1/-1)
1 file modified
Makefile (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-server/protocol-link-magicicada-protocol
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2018-04-13
Review via email:

Commit message

- Restored protocol link in sourcedeps to point to magicicada-protocol folder and make the protocol wheel install in that folder.

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :


review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-04-12 02:07:28 +0000
3+++ Makefile 2018-04-13 14:25:56 +0000
4@@ -101,7 +101,7 @@
5 test -d $(ENV) || virtualenv $(ENV)
6 $(ENV)/bin/pip install -Ur requirements.txt
7 $(ENV)/bin/pip install -Ur requirements-devel.txt
8- $(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t $(TARGET_SOURCECODE_DIR)
9+ $(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t "$(TARGET_SOURCECODE_DIR)/magicicada-protocol"
10 touch $(ENV)/bin/activate
12 raw-test:
14=== modified symlink 'lib/ubuntuone/storageprotocol'
15=== target changed u'../../.sourcecode/ubuntuone/storageprotocol' => u'../../.sourcecode/magicicada-protocol/ubuntuone/storageprotocol'


People subscribed via source and target branches

to all changes: