Entertainer Media Center

Merge lp://staging/~mblayman/entertainer/root-fix into lp://staging/entertainer

  1. root-fix
  2. Merge into trunk
Proposed by Matt Layman
Status: Merged
Approved by: Samuel Buffet
Approved revision: 387
Merged at revision: not available
Proposed branch: lp://staging/~mblayman/entertainer/root-fix
Merge into: lp://staging/entertainer
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~mblayman/entertainer/root-fix
Reviewer Review Type Date Requested Status
Samuel Buffet (community) Approve
Review via email: mp+7977@code.staging.launchpad.net

Commit message

The root is now properly set so that setup.py install should work again.

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

This is the trivial fix for the setup.py bug that is happening (probably because of python 2.6). I've changed self.root to "/" so that there should be no problems joining the path now.

I did hunt far and wide for a more programatic way to set the root in Python, but I failed to find one in os, os.path, sys, or distutils. The closest was prefix and that is still not what we want.

Revision history for this message
Samuel Buffet (samuel-buffet) wrote :

Matt,

I'm all for this fix.

Samuel-

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-04-28 23:54:49 +0000
3+++ setup.py 2009-06-27 21:11:50 +0000
4@@ -25,7 +25,7 @@
5 _install.run(self)
6
7 # Now that distutils install is finished, run any post-processing stuff
8- target = os.path.join(self.root, "usr", "share", "icons", "hicolor")
9+ target = os.path.join("/", "usr", "share", "icons", "hicolor")
10 log.info("Updating icon cache in %s" % target)
11 call(['gtk-update-icon-cache', '-f', '-t', target])
12

Subscribers

People subscribed via source and target branches