|
17 | 17 |
|
18 | 18 | warning = """
|
19 | 19 | Wrong splint in show_pb
|
20 |
| -Original Header: |
| 20 | +Original Header:f |
21 | 21 | {header}
|
22 | 22 | Original Body:
|
23 | 23 | {body}
|
@@ -139,14 +139,12 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
|
139 | 139 | def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
|
140 | 140 | if options is None:
|
141 | 141 | options = []
|
142 |
| - return self.run([ |
143 |
| - 'init', |
144 |
| - ] + options, |
145 |
| - old_binary=old_binary, |
146 |
| - skip_log_directory=skip_log_directory, |
147 |
| - expect_error=expect_error, |
148 |
| - use_backup_dir=use_backup_dir |
149 |
| - ) |
| 142 | + return self.run(['init'] + options, |
| 143 | + old_binary=old_binary, |
| 144 | + skip_log_directory=skip_log_directory, |
| 145 | + expect_error=expect_error, |
| 146 | + use_backup_dir=use_backup_dir |
| 147 | + ) |
150 | 148 |
|
151 | 149 | def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
|
152 | 150 | if options is None:
|
@@ -545,7 +543,6 @@ def show_archive(
|
545 | 543 | break
|
546 | 544 |
|
547 | 545 | if tli > 0:
|
548 |
| - timeline_data = None |
549 | 546 | for timeline in instance_timelines:
|
550 | 547 | if timeline['tli'] == tli:
|
551 | 548 | return timeline
|
@@ -674,7 +671,7 @@ def set_archiving(
|
674 | 671 | archive_command += ' --remote-proto=ssh --remote-host=localhost'
|
675 | 672 |
|
676 | 673 | if init_params.archive_compress and compress:
|
677 |
| - archive_command += ' --compress-algorithm='+init_params.archive_compress |
| 674 | + archive_command += ' --compress-algorithm=' + init_params.archive_compress |
678 | 675 |
|
679 | 676 | if overwrite:
|
680 | 677 | archive_command += ' --overwrite'
|
@@ -758,8 +755,8 @@ def load_backup_class(fs_type):
|
758 | 755 | if root not in sys.path:
|
759 | 756 | sys.path.append(root)
|
760 | 757 | from pg_probackup2.storage.s3_backup import S3TestBackupDir
|
| 758 | + |
761 | 759 | fs_backup_class = S3TestBackupDir
|
762 | 760 |
|
763 | 761 | def build_backup_dir(self, backup='backup'):
|
764 | 762 | return fs_backup_class(rel_path=self.rel_path, backup=backup)
|
765 |
| - |
0 commit comments