diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-17 17:39:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-17 17:39:16 +0000 |
| commit | 14885f1f2b0cf43bfc77ee43d19b71821b8b793e (patch) | |
| tree | 6743b7fe9fb5b99f3dfdcd265845edf85e0aae8b | |
| parent | 6b03992c280f69873072369e3bc2b5c843595fd4 (diff) | |
| parent | fc1caced86b80bb171f495a0f09aed3ef867ab01 (diff) | |
| download | kolla-14885f1f2b0cf43bfc77ee43d19b71821b8b793e.tar.gz kolla-14885f1f2b0cf43bfc77ee43d19b71821b8b793e.zip | |
Merge "Only copy symlinks when merge and preserve_properties are set"
| -rw-r--r-- | docker/base/set_configs.py | 2 |
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: |