summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-01-24 17:14:50 -0800
committerJelmer Vernooij <jelmer@samba.org>2011-01-24 17:14:50 -0800
commit4078b649f19adaba3218d8241455138981d0f3a2 (patch)
tree855f146fb9237b305fc93027071bf73f85db61ef
parentb763a2735ee761ba614ca3868cd962847f9adda6 (diff)
downloadsamba-4078b649f19adaba3218d8241455138981d0f3a2.tar.gz
samba-4078b649f19adaba3218d8241455138981d0f3a2.tar.bz2
samba-4078b649f19adaba3218d8241455138981d0f3a2.zip
Show text output messages when interfacing with bzr.
-rw-r--r--buildtools/wafsamba/samba_version.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 8d1bd32431..5069ea3982 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -1,13 +1,18 @@
import os
import Utils
import samba_utils
+import sys
def bzr_version_summary(path):
try:
- from bzrlib import branch, osutils, workingtree
+ import bzrlib
except ImportError:
return ("BZR-UNKNOWN", {})
+ import bzrlib.ui
+ bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal(
+ sys.stdin, sys.stdout, sys.stderr)
+ from bzrlib import branch, osutils, workingtree
from bzrlib.plugin import load_plugins
load_plugins()