From fd41408de22f74b8af43751c187b2f23fb4aa157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Fri, 9 Oct 2015 12:34:02 -0400 Subject: [PATCH] move progress information out of tests and back in converter this was a remnant of when i was writing the converter/upgrader code, and was destined to be a general progress message in the migration process. i removed a more technical, internal debugging message in exchange --- borg/testsuite/upgrader.py | 4 ---- borg/upgrader.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/borg/testsuite/upgrader.py b/borg/testsuite/upgrader.py index e93f335be..757273189 100644 --- a/borg/testsuite/upgrader.py +++ b/borg/testsuite/upgrader.py @@ -1,5 +1,3 @@ -import logging -logger = logging.getLogger(__name__) import os import shutil import tempfile @@ -79,7 +77,6 @@ def test_convert_segments(tmpdir, attic_repo): """ # check should fail because of magic number assert not repo_valid(tmpdir) - logger.info("opening attic repository with borg and converting") repo = AtticRepositoryUpgrader(str(tmpdir), create=False) segments = [filename for i, filename in repo.io.segment_iterator()] repo.close() @@ -158,7 +155,6 @@ def test_convert_all(tmpdir, attic_repo, attic_key_file): """ # check should fail because of magic number assert not repo_valid(tmpdir) - logger.info("opening attic repository with borg and converting") repo = AtticRepositoryUpgrader(str(tmpdir), create=False) repo.upgrade(dryrun=False) assert key_valid(attic_key_file.path) diff --git a/borg/upgrader.py b/borg/upgrader.py index 119cf7b4e..33f100e38 100644 --- a/borg/upgrader.py +++ b/borg/upgrader.py @@ -26,8 +26,8 @@ class AtticRepositoryUpgrader(Repository): we nevertheless do the order in reverse, as we prefer to do the fast stuff first, to improve interactivity. """ - logger.info("reading segments from attic repository using borg") - # we need to open it to load the configuration and other fields + logger.info("opening attic repository with borg and converting") + # we need to open the repo to load configuration, keyfiles and segments self.open(self.path, exclusive=False) segments = [filename for i, filename in self.io.segment_iterator()] try: