Merge pull request #9 from JedMeister/fix-spaces-in-limits

Fix spaces in limits

Author: JedMeister

cmd_restore.py

@@ -135,6 +135,7 @@
 
 from string import Template
 import re
+import shlex
 
 from os.path import *
 from restore import Restore
@@ -338,7 +339,7 @@ def main():
         elif opt == '--simulate':
             opt_simulate = True
         elif opt == '--limits':
-            opt_limits += re.split(r'\s+', val)
+            opt_limits += shlex.split(val)
         elif opt == '--keyfile':
             if not isfile(val):
                 fatal("keyfile %s does not exist or is not a file" % `val`)

conf.py

@@ -30,7 +30,7 @@ def fromfile(cls, inputfile):
             if not line:
                 continue
 
-            limits += line.split()
+            limits.append(line)
 
         def is_legal(limit):
             if cls._is_db_limit(limit):

docs/tklbam-backup.txt

@@ -23,6 +23,11 @@ ARGUMENTS
 
 Overrides are usually configured in /etc/tklbam/overrides.
 
+Note overrides that include a space in their path do NOT need to be escaped
+when included in /etc/tklbam/overrides (just put them on their own line).
+If excluding/including them from the commandline, they can be escaped or
+quoted. E.g. /path\ with\ space/ or "/path with space/".
+
 Filesystem overrides
 --------------------
 

docs/tklbam-restore.txt

@@ -88,6 +88,9 @@ System restore options
                                   Preceding a limit with a minus sign
                                   turns it into an exclusion.
 
+                                  Mutliple items are space separated. Spaces in paths must be
+                                  escaped. E.g. --limits="/path\ with\ spaces -/another\ path"
+
   `LIMITS` := "``LIMIT``-1 .. ``LIMIT``-N"
 
   ``LIMIT`` :=  -?( /path/to/include/or/exclude |