testtools-dev team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/testtools/setup.py-nobzr into lp:testtools.

Requested reviews:
  testtools developers (testtools-dev)

For more details, see:
https://code.launchpad.net/~jelmer/testtools/setup.py-nobzr/+merge/51518

Support installing a snapshot from a directory that is not a Bazaar working tree.

This is required for the daily builds.
-- 
https://code.launchpad.net/~jelmer/testtools/setup.py-nobzr/+merge/51518
Your team testtools developers is requested to review the proposed merge of lp:~jelmer/testtools/setup.py-nobzr into lp:testtools.

=== modified file 'setup.py'
--- setup.py	2011-02-13 16:20:45 +0000
+++ setup.py	2011-02-28 11:39:58 +0000
@@ -7,10 +7,16 @@
 
 import testtools
 
+
 def get_revno():
+    import bzrlib.errors
     import bzrlib.workingtree
-    t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0]
-    return t.branch.revno()
+    try:
+        t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0]
+    except bzrlib.errors.NotBranchError:
+        return None
+    else:
+        return t.branch.revno()
 
 
 def get_version_from_pkg_info():
@@ -38,6 +44,8 @@
     if pkg_info_version:
         return pkg_info_version
     revno = get_revno()
+    if revno is None:
+        return "snapshot"
     if phase == 'alpha':
         # No idea what the next version will be
         return 'next-r%s' % revno