Ubuntu One Client

Merge lp://qastaging/~dobey/ubuntuone-client/build-fix into lp://qastaging/ubuntuone-client

  1. build-fix
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Joshua Blount
Approved revision: 19
Merged at revision: not available
Proposed branch: lp://qastaging/~dobey/ubuntuone-client/build-fix
Merge into: lp://qastaging/ubuntuone-client
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-client/build-fix
Reviewer Review Type Date Requested Status
Joshua Blount (community) Approve
Rick McBride (community) Approve
Review via email: mp+6631@code.qastaging.launchpad.net

Commit message

[r=rmcbride, r=jblount] Fix the class inheritance and pull in the default build options

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

Fix the class inheritance and pull in the default build options

Revision history for this message
Rick McBride (rmcbride) wrote :

Awesome! Makes more sense than my fix did :)

review: Approve
Revision history for this message
Joshua Blount (jblount) wrote :

Fantastic, I love small branches

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 2009-05-14 19:37:46 +0000
3+++ setup.py 2009-05-15 19:10:17 +0000
4@@ -23,14 +23,14 @@
5 """Failed to launch our dbus session daemon."""
6 pass
7
8-class UbuntuOneBuild(build_extra.build):
9+class UbuntuOneBuild(build_extra.build_extra):
10 """Class to build our stuff."""
11
12 description = "generate our icons and some other things"
13
14 user_options = [("protocol-source=", None,
15 "path to ubuntuone-storage-protocol source tree")
16- ]
17+ ] + build_extra.build_extra.user_options
18
19 def initialize_options(self):
20 """Do build-extra options initialization."""

Subscribers

People subscribed via source and target branches