openstack/kolla
Code Issues Proposed changes

Merge "Only copy symlinks when merge and preserve_properties are set"

Browse Source
This commit is contained in:
Jenkins
2017-07-17 17:39:16 +00:00
committed by Gerrit Code Review
parent 6b03992c28 fc1caced86
commit 14885f1f2b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/set_configs.py
View File

@@ -75,7 +75,7 @@ class ConfigFile(object):
self._delete_path(dest) self._delete_path(dest)
# dest endswith / means copy the <source> to <dest> folder # dest endswith / means copy the <source> to <dest> folder
LOG.info('Copying %s to %s', source, dest) 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) link_target = os.readlink(source)
os.symlink(link_target, dest) os.symlink(link_target, dest)
else: else: