Add add_error imports missed in import * removal

[rlb@defaultvalue.org: rebased on current master; squashed related
 patches; adjusted commit message]
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/cmd/bloom-cmd.py b/cmd/bloom-cmd.py
index f968fa02e398fab2b55e85a62af30deb9435e7aa..05b7d1e55a4ab6370e2e96c28e94bed1c5c2c876 100755 (executable)
--- a/cmd/bloom-cmd.py
+++ b/cmd/bloom-cmd.py
@@ -8,7 +8,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 import glob, os, sys, tempfile
 
 from bup import options, git, bloom
-from bup.helpers import (debug1, handle_ctrl_c, log, progress, qprogress,
+from bup.helpers import (add_error, debug1, handle_ctrl_c, log, progress, qprogress,
                          saved_errors)
 
 optspec = """

diff --git a/cmd/index-cmd.py b/cmd/index-cmd.py
index 848eeaabdadfe7055af206574bef458410fbbbdb..ab97e928407bc21e081e5af5b9b64ddbe1da339d 100755 (executable)
--- a/cmd/index-cmd.py
+++ b/cmd/index-cmd.py
@@ -10,7 +10,7 @@ import sys, stat, time, os, errno, re
 from bup import metadata, options, git, index, drecurse, hlinkdb
 from bup.drecurse import recursive_dirlist
 from bup.hashsplit import GIT_MODE_TREE, GIT_MODE_FILE
-from bup.helpers import (handle_ctrl_c, log, parse_excludes, parse_rx_excludes,
+from bup.helpers import (add_error, handle_ctrl_c, log, parse_excludes, parse_rx_excludes,
                          progress, qprogress, saved_errors)
 
 

diff --git a/cmd/list-idx-cmd.py b/cmd/list-idx-cmd.py
index 0d5e9aca04a3dc0ffa4f7e0984b7434f4a7edf04..d2c981bf635b6b1392898660e950edabded350da 100755 (executable)
--- a/cmd/list-idx-cmd.py
+++ b/cmd/list-idx-cmd.py
@@ -8,7 +8,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 import sys, os
 
 from bup import git, options
-from bup.helpers import handle_ctrl_c, log, qprogress, saved_errors
+from bup.helpers import add_error, handle_ctrl_c, log, qprogress, saved_errors
 
 
 optspec = """

diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
index 1879550b7c9fdb5f463ad9b957599fc45cd06bd8..8e0b87e1d948bf836b58c2b8d65e57122c00dda1 100755 (executable)
--- a/cmd/midx-cmd.py
+++ b/cmd/midx-cmd.py
@@ -8,7 +8,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 import glob, math, os, resource, struct, sys, tempfile
 
 from bup import options, git, midx, _helpers, xstat
-from bup.helpers import (Sha1, atomically_replaced_file, debug1, fdatasync,
+from bup.helpers import (Sha1, add_error, atomically_replaced_file, debug1, fdatasync,
                          handle_ctrl_c, log, mmap_readwrite, qprogress,
                          saved_errors, unlink)
 

diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py
index e813dd7d2658b4420ab21f9b9a7f4f78a7b9fc06..57c7392c78a57864d579e948ad42d5c3bf78f978 100755 (executable)
--- a/cmd/split-cmd.py
+++ b/cmd/split-cmd.py
@@ -8,8 +8,9 @@ exec "$bup_python" "$0" ${1+"$@"}
 import os, sys, time
 
 from bup import hashsplit, git, options, client
-from bup.helpers import (handle_ctrl_c, hostname, log, parse_num, qprogress,
-                         reprogress, saved_errors, userfullname, username)
+from bup.helpers import (add_error, handle_ctrl_c, hostname, log, parse_num,
+                         qprogress, reprogress, saved_errors,
+                         userfullname, username)
 
 
 optspec = """

diff --git a/cmd/xstat-cmd.py b/cmd/xstat-cmd.py
index f299cbca7bf5a1ce12e745ad98a54f515c4fdd59..9f328458c3a343c7bf87fc6c471dd411815418c8 100755 (executable)
--- a/cmd/xstat-cmd.py
+++ b/cmd/xstat-cmd.py
@@ -10,7 +10,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 # Public License as described in the bup LICENSE file.
 import sys, stat, errno
 from bup import metadata, options, xstat
-from bup.helpers import handle_ctrl_c, parse_timestamp, saved_errors, \
+from bup.helpers import add_error, handle_ctrl_c, parse_timestamp, saved_errors, \
     add_error, log
 
 

diff --git a/lib/bup/drecurse.py b/lib/bup/drecurse.py
index f52d8ecd7007a0785be4cbe353dd58f5b35330ed..376ab34953008b10e7ac4e4acbfea3667a50af6c 100644 (file)
--- a/lib/bup/drecurse.py
+++ b/lib/bup/drecurse.py
@@ -1,7 +1,7 @@
 
 import stat, os
 
-from bup.helpers import should_rx_exclude_path, debug1
+from bup.helpers import add_error, should_rx_exclude_path, debug1
 import bup.xstat as xstat