From 63199592fea8c24ac4070e6a6ea325448b5eeae1 Mon Sep 17 00:00:00 2001 From: Pengju Jiao Date: Tue, 16 May 2017 17:00:48 +0800 Subject: [PATCH] Fix dereference-symlink value check error Currently, freezer use a string 'none' to judge if the parameter 'dereference-symlink' is None or not. This patch will fix it. Change-Id: I661debd0b223059824acd8e2b472a6afe1682b09 Closes-Bug: #1691052 --- freezer/engine/tar/tar_builders.py | 2 +- freezer/job.py | 2 +- freezer/tests/commons.py | 2 +- specs/job-backup.conf.example | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/freezer/engine/tar/tar_builders.py b/freezer/engine/tar/tar_builders.py index e5211853..8e1fb110 100644 --- a/freezer/engine/tar/tar_builders.py +++ b/freezer/engine/tar/tar_builders.py @@ -63,7 +63,7 @@ class TarCommandBuilder(object): 'soft' dereference soft links, 'hard' dereference hardlinks, 'all' dereference both. - Default 'none'. + Default 'None'. """ self.dereference = self.DEREFERENCE_MODE[mode] diff --git a/freezer/job.py b/freezer/job.py index 9c12861b..263c7bf9 100644 --- a/freezer/job.py +++ b/freezer/job.py @@ -223,7 +223,7 @@ class BackupJob(Job): # Checksum for Backup Consistency if self.conf.consistency_check: - ignorelinks = (self.conf.dereference_symlink == 'none' or + ignorelinks = (self.conf.dereference_symlink is None or self.conf.dereference_symlink == 'hard') consistency_checksum = checksum.CheckSum( filepath, ignorelinks=ignorelinks).compute() diff --git a/freezer/tests/commons.py b/freezer/tests/commons.py index 3a9759dc..769d2ce6 100644 --- a/freezer/tests/commons.py +++ b/freezer/tests/commons.py @@ -286,7 +286,7 @@ class FakeSwiftClient(object): class BackupOpt1(object): def __init__(self): - self.dereference_symlink = 'none' + self.dereference_symlink = None self.mysql_conf = '/tmp/freezer-test-conf-file' self.backup_media = 'fs' self.lvm_auto_snap = '/dev/null' diff --git a/specs/job-backup.conf.example b/specs/job-backup.conf.example index 99048526..c86f1028 100644 --- a/specs/job-backup.conf.example +++ b/specs/job-backup.conf.example @@ -95,8 +95,8 @@ restart_always_level = False dst_file = False # Follow hard and soft links and archive and dump the -# files they refer to. Possible options are {none,soft,hard,all} -dereference_symlink = none +# files they refer to. Possible options are {None,soft,hard,all} +dereference_symlink = None # Set the hostname used to identify the data you want to # restore from. If you want to restore data in the same