ls: add missing sys and columnate imports

This was ignored by the existing tests because there was no tty.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/ls.py b/lib/bup/ls.py
index 6e66be5e838bc7281787604cdd0f5f87f6482d19..b52b188f1ec4d66067d17c6b2b4ff6b67aa26de8 100644 (file)
--- a/lib/bup/ls.py
+++ b/lib/bup/ls.py
@@ -1,9 +1,9 @@
 """Common code for listing files from a bup repository."""
 
-import copy, os.path, stat, xstat
+import copy, os.path, stat, sys, xstat
 
 from bup import metadata, options, vfs
-from helpers import istty1, log
+from helpers import columnate, istty1, log
 
 
 def node_info(n, name,

diff --git a/t/test-ls.sh b/t/test-ls.sh
index b5b750b3846684a307b8105f50268aaea64785c1..5d8fda86b4c8face2b6248d38d3c943e0a89684e 100755 (executable)
--- a/t/test-ls.sh
+++ b/t/test-ls.sh
@@ -35,6 +35,8 @@ WVPASS bup tag some-tag src
 
 WVSTART "ls (short)"
 
+(export BUP_FORCE_TTY=1; WVPASSEQ "$(WVPASS bup ls | tr -d ' ')" src)
+
 WVPASSEQ "$(WVPASS bup ls /)" "src"
 
 WVPASSEQ "$(WVPASS bup ls -A /)" ".commit