ubuntuone-testing

Merge lp:~elopio/ubuntuone-testing/fix-sourcedeps2 into lp:ubuntuone-testing

  1. fix-sourcedeps2
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Sidnei da Silva
Approved revision: 104
Merged at revision: 104
Proposed branch: lp:~elopio/ubuntuone-testing/fix-sourcedeps2
Merge into: lp:ubuntuone-testing
Diff against target: 17 lines (+4/-3)
1 file modified
Makefile (+4/-3)
To merge this branch: bzr merge lp:~elopio/ubuntuone-testing/fix-sourcedeps2
Reviewer Review Type Date Requested Status
Sidnei da Silva (community) Approve
Review via email: mp+114738@code.launchpad.net

Commit message

build-sourcedeps won't fail when a sourcedep doesn't have a setup.py file.

Description of the change

The build-sourcedeps task was marking the build as failed because one of the directories doesn't have a setup.py file.
I added an if, and it works now.

To post a comment you must log in.
Revision history for this message
Sidnei da Silva (sidnei) wrote :

+1!

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 2012-07-10 23:53:45 +0000
3+++ Makefile 2012-07-12 21:20:22 +0000
4@@ -62,9 +62,10 @@
5 build-sourcedeps:
6 @echo "Building Python extensions"
7 @for d in sourcecode/* ; do \
8- test -e "$$d/setup.py" && \
9- ( cd "$$d" && $(PYTHON) \
10- setup.py build build_ext --inplace > /dev/null) ; \
11+ if test -e "$$d/setup.py" ; then \
12+ (cd "$$d" && $(PYTHON) \
13+ setup.py build build_ext --inplace > /dev/null) ; \
14+ fi ; \
15 done
16
17 update-sourcedeps: link-sourcedeps build-sourcedeps

Subscribers

People subscribed via source and target branches