LAZR Javascript Library

Merge lp:~deryck/lazr-js/fix-build-assuming-branch into lp:lazr-js

  1. fix-build-assuming-branch
  2. Merge into toolchain
Proposed by Deryck Hodge on 2010-11-29
Status: Merged
Approved by: Deryck Hodge on 2010-11-29
Approved revision: 190
Merged at revision: 190
Proposed branch: lp:~deryck/lazr-js/fix-build-assuming-branch
Merge into: lp:lazr-js
Diff against target: 16 lines (+0/-6)
1 file modified
setup.py (+0/-6)
To merge this branch: bzr merge lp:~deryck/lazr-js/fix-build-assuming-branch
Reviewer Review Type Date Requested Status
Paul Hummer (community) 2010-11-29 Approve on 2010-11-29
Review via email: mp+42130@code.launchpad.net

Commit Message

[r=rockstar][ui=none][no-qa]

Description of the Change

lazr-js is failing to build when built from an sdist tarball,
since this is not a branch.

Fix this by not trying to include revno in __version__ string.

To post a comment you must log in.
Paul Hummer (rockstar) :
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 2010-09-10 17:43:25 +0000
3+++ setup.py 2010-11-29 15:58:54 +0000
4@@ -6,12 +6,6 @@
5 from setuptools import setup
6
7 __version__ = '1.5DEV'
8-try:
9- from bzrlib import branch
10- __version__ += '-r%s' % branch.Branch.open('.').revno()
11-except ImportError:
12- pass
13-
14
15 setup(
16 name='lazr-js',

Subscribers

People subscribed via source and target branches