1
0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-13 14:58:35 +02:00
This commit is contained in:
a.kozhemyakin 2021-02-15 10:49:16 +03:00
parent eb91b7d54a
commit 4261d5eba4

View File

@ -1541,13 +1541,6 @@ class ProbackupTest(object):
),
ignore_errors=True
)
<<<<<<< HEAD
=======
try:
shutil.rmtree(os.path.join(self.tmp_path, module_name), ignore_errors=True)
except:
pass
>>>>>>> 7f1d12b457f54ddebc0b6f65a1124e7f75dd50ae
def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
""" return dict with directory content. "