Merge lp:~jacekn/charm-helpers/charm-helpers-bugfix into lp:charm-helpers

[Jacek Nykis]

Fixed small bug. This way if bzrlib is not available BzrFetchUrlHandler will try to install it

[Matthew Wedgwood (mew)]

Yep, looks like the right thing to do.

review: Approve

=== modified file 'charmhelpers/fetch/bzrurl.py'
--- charmhelpers/fetch/bzrurl.py	2013-08-21 11:45:37 +0000
+++ charmhelpers/fetch/bzrurl.py	2013-08-22 10:21:29 +0000
@@ -1,11 +1,16 @@
 import os
-from bzrlib.branch import Branch
 from charmhelpers.fetch import (
     BaseFetchHandler,
     UnhandledSource
 )
 from charmhelpers.core.host import mkdir
 
+try:
+    from bzrlib.branch import Branch
+except ImportError:
+    from charmhelpers.fetch import apt_install
+    apt_install("python-bzrlib")
+    from bzrlib.branch import Branch
 
 class BzrUrlFetchHandler(BaseFetchHandler):
     """Handler for bazaar branches via generic and lp URLs"""