Browse Source

Remove dead code.

tags/1.2.16
Dan Helfman 6 months ago
parent
commit
fb21d4e645
2 changed files with 0 additions and 27 deletions
  1. 0
    18
      borgmatic/config/convert.py
  2. 0
    9
      tests/unit/config/test_convert.py

+ 0
- 18
borgmatic/config/convert.py View File

@@ -93,21 +93,3 @@ def guard_configuration_upgraded(source_config_filename, destination_config_file

if os.path.exists(source_config_filename) and not destination_config_exists:
raise LegacyConfigurationNotUpgraded()


class LegacyExcludesFilenamePresent(FileNotFoundError):
def __init__(self):
super(LegacyExcludesFilenamePresent, self).__init__(
'''borgmatic changed its configuration file format in version 1.1.0 from INI-style
to YAML. This better supports validation, and has a more natural way to express
lists of values. The new configuration file incorporates excludes, so you no
longer need to provide an excludes filename on the command-line with an
"--excludes" argument.

Please remove the "--excludes" argument and run borgmatic again.'''
)


def guard_excludes_filename_omitted(excludes_filename):
if excludes_filename is not None:
raise LegacyExcludesFilenamePresent()

+ 0
- 9
tests/unit/config/test_convert.py View File

@@ -117,12 +117,3 @@ def test_guard_configuration_upgraded_does_not_raise_when_neither_config_present
flexmock(os.path).should_receive('exists').with_args('other.yaml').and_return(False)

module.guard_configuration_upgraded('config', ('config.yaml', 'other.yaml'))


def test_guard_excludes_filename_omitted_raises_when_filename_provided():
with pytest.raises(module.LegacyExcludesFilenamePresent):
module.guard_excludes_filename_omitted(excludes_filename='/etc/borgmatic/excludes')


def test_guard_excludes_filename_omitted_does_not_raise_when_filename_not_provided():
module.guard_excludes_filename_omitted(excludes_filename=None)

Loading…
Cancel
Save