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

.hgtags

@@ -30,3 +30,5 @@ dbc96d3f83bd5570b6826537616d4160b3374836 0.1.8
 de2d7721cdec93a52d20222a9ddd579ed93c1017 1.0.1
 9603d13910b32d57a887765cab694ac5d0acc1f4 1.0.2
 32c6341dda9fad77a3982641bce8a3a45821842e 1.0.3
+5a003056a8ff4709c5bd4d6d33354199423f8a1d 1.1.0
+7d3d11eff6c0773883c48f221431f157bc7995eb 1.1.1

NEWS

@@ -1,3 +1,13 @@
+1.1.2
+
+ * #32: Fix for passing check_last as integer to subprocess when calling Borg.
+
+1.1.1
+
+ * 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
 
  * Switched config file format to YAML. Run upgrade-borgmatic-config to upgrade.

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/config/convert.py

@@ -10,10 +10,16 @@ def _convert_section(source_section_config, section_schema):
     Given a legacy Parsed_config instance for a single section, convert it to its corresponding
     yaml.comments.CommentedMap representation in preparation for actual serialization to YAML.
 
-    Additionally, use the section schema as a source of helpful comments to include within the
-    returned CommentedMap.
+    Where integer types exist in the given section schema, convert their values to integers.
     '''
-    destination_section_config = yaml.comments.CommentedMap(source_section_config)
+    destination_section_config = yaml.comments.CommentedMap([
+        (
+            option_name,
+            int(option_value)
+                if section_schema['map'].get(option_name, {}).get('type') == 'int' else option_value
+        )
+        for option_name, option_value in source_section_config.items()
+    ])
 
     return destination_section_config
 
@@ -39,7 +45,7 @@ def convert_legacy_parsed_config(source_config, source_excludes, schema):
     location['repositories'] = [location.pop('repository')]
     location['exclude_patterns'] = source_excludes
 
-    if source_config.consistency['checks']:
+    if source_config.consistency.get('checks'):
         destination_config['consistency']['checks'] = source_config.consistency['checks'].split(' ')
 
     # Add comments to each section, and then add comments to the fields in each section.

borgmatic/tests/unit/config/test_convert.py

@@ -10,6 +10,16 @@ from borgmatic.config import convert as module
 Parsed_config = namedtuple('Parsed_config', ('location', 'storage', 'retention', 'consistency'))
 
 
+def test_convert_section_generates_integer_value_for_integer_type_in_schema():
+    flexmock(module.yaml.comments).should_receive('CommentedMap').replace_with(OrderedDict)
+    source_section_config = OrderedDict([('check_last', '3')])
+    section_schema = {'map': {'check_last': {'type': 'int'}}}
+
+    destination_config = module._convert_section(source_section_config, section_schema)
+
+    assert destination_config == OrderedDict([('check_last', 3)])
+
+
 def test_convert_legacy_parsed_config_transforms_source_config_to_mapping():
     flexmock(module.yaml.comments).should_receive('CommentedMap').replace_with(OrderedDict)
     source_config = Parsed_config(

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.cfg

@@ -1,5 +1,2 @@
 [metadata]
 description-file=README.md
-
-[bdist_wheel]
-universal=1

setup.py

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