#32: Fix for passing check_last as integer to subprocess when calling Borg.

.hgtags

@@ -31,3 +31,4 @@ de2d7721cdec93a52d20222a9ddd579ed93c1017 1.0.1
 9603d13910b32d57a887765cab694ac5d0acc1f4 1.0.2
 32c6341dda9fad77a3982641bce8a3a45821842e 1.0.3
 5a003056a8ff4709c5bd4d6d33354199423f8a1d 1.1.0
+7d3d11eff6c0773883c48f221431f157bc7995eb 1.1.1

NEWS

@@ -1,7 +1,11 @@
+1.1.2
+
+ * #32: Fix for passing check_last as integer to subprocess when calling Borg.
+
 1.1.1
 
- * #32: Fix for upgrade-borgmatic-config converting check_last option as a string instead of an
-   integer.
+ * Part of #32: Fix for upgrade-borgmatic-config converting check_last option as a string instead of
+   an integer.
  * Fix for upgrade-borgmatic-config erroring when consistency checks option is not present.
 
 1.1.0

borgmatic/borg.py

@@ -162,10 +162,9 @@ def _make_check_flags(checks, check_last=None):
 
         ('--repository-only',)
 
-    Additionally, if a check_last value is given, a "--last" flag will be added. Note that only
-    Borg supports this flag.
+    Additionally, if a check_last value is given, a "--last" flag will be added.
     '''
-    last_flag = ('--last', check_last) if check_last else ()
+    last_flag = ('--last', str(check_last)) if check_last else ()
     if checks == DEFAULT_CHECKS:
         return last_flag
 

borgmatic/tests/unit/test_borg.py

@@ -409,13 +409,13 @@ def test_make_check_flags_with_default_checks_returns_no_flags():
 def test_make_check_flags_with_checks_and_last_returns_flags_including_last():
     flags = module._make_check_flags(('foo', 'bar'), check_last=3)
 
-    assert flags == ('--foo-only', '--bar-only', '--last', 3)
+    assert flags == ('--foo-only', '--bar-only', '--last', '3')
 
 
 def test_make_check_flags_with_last_returns_last_flag():
     flags = module._make_check_flags(module.DEFAULT_CHECKS, check_last=3)
 
-    assert flags == ('--last', 3)
+    assert flags == ('--last', '3')
 
 
 def test_check_archives_should_call_borg_with_parameters():

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '1.1.1'
+VERSION = '1.1.2'
 
 
 setup(