Replace atoi with explicit checks; rm unused atof

[bup.git] / lib / cmd / margin-cmd.py

diff --git a/lib/cmd/margin-cmd.py b/lib/cmd/margin-cmd.py
index 9dc854aaee57447607a93068bfb760029dcb37e4..09411bc7778c0d5f643f8f6b520d334088879fcd 100755 (executable)
--- a/lib/cmd/margin-cmd.py
+++ b/lib/cmd/margin-cmd.py
@@ -9,13 +9,15 @@ for arg in "$@"; do
     arg_i=$((arg_i + 1))
 done
 # Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/bup-python" || exit $?
+bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
 exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import
-import sys, struct, math
+import math, os.path, struct, sys
+
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
 
 from bup import compat, options, git, _helpers
 from bup.helpers import log