Ubuntu Single Sign On Client

Merge lp:~dobey/ubuntu-sso-client/no-root into lp:ubuntu-sso-client

  1. no-root
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1027
Merged at revision: 1027
Proposed branch: lp:~dobey/ubuntu-sso-client/no-root
Merge into: lp:ubuntu-sso-client
Diff against target: 13 lines (+2/-1)
1 file modified
setup.py (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu-sso-client/no-root
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Brian Curtin (community) Approve
Review via email: mp+156948@code.launchpad.net

Commit message

Only replace root in the install_data string when root is set.

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

this fixes the issue at hand for me on osx

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 2013-03-21 15:28:30 +0000
3+++ setup.py 2013-04-03 19:05:23 +0000
4@@ -86,7 +86,8 @@
5 @prefix@ by self.prefix.
6
7 """
8- prefix = self.install_data.replace(self.root, '')
9+ prefix = self.install_data.replace(
10+ self.root if self.root is not None else '', '')
11 replace_prefix(prefix)
12 DistUtilsExtra.auto.install_auto.run(self)
13 # Replace the CONSTANTS prefix here, so that we can do it directly in

Subscribers

People subscribed via source and target branches