summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/base/set_configs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py
index b6c56ca97..65ce210ba 100644
--- a/docker/base/set_configs.py
+++ b/docker/base/set_configs.py
@@ -75,7 +75,7 @@ class ConfigFile(object):
self._delete_path(dest)
# dest endswith / means copy the <source> to <dest> folder
LOG.info('Copying %s to %s', source, dest)
- if os.path.islink(source):
+ if self.merge and self.preserve_properties and os.path.islink(source):
link_target = os.readlink(source)
os.symlink(link_target, dest)
else: