Ubuntu One Client

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

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

Commit message

[rs=rmcbride] Work around a weird error getting trapped by distutils

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

Not sure why this is failing exactly. Presumably the file exists, but is a broken symlink. I don't know why the other symlink checks don't exhibit the same problem. But this at least makes the packages build again, so a reasonable temporary fix I do declare it is.

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

Looks good!

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-15 19:39:30 +0000
3+++ setup.py 2009-05-15 21:11:04 +0000
4@@ -78,7 +78,14 @@
5 "storage", "protocol")
6 if not os.path.exists(localprotocol):
7 protopath = os.path.join(self.protocol_source, localprotocol)
8- os.symlink(protopath, localprotocol)
9+ try:
10+ os.symlink(protopath, localprotocol)
11+ except (IOError, os.error), e:
12+ if hasattr(e, 'filename') and e.filename:
13+ print "%s: %s" % (e.filename, e.strerror)
14+ else:
15+ print "%s: %s" % (localprotocol, e.strerror)
16+
17
18 build_extra.build_extra.run(self)
19

Subscribers

People subscribed via source and target branches