Browse Source

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
Antoine Beaupré 9 years ago
parent
commit
fd41408de2
2 changed files with 2 additions and 6 deletions
  1. 0 4
      borg/testsuite/upgrader.py
  2. 2 2
      borg/upgrader.py

+ 0 - 4
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)

+ 2 - 2
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: