search

oracle / opengrok

OpenGrok is a fast and usable source code search and cross reference engine, written in Java
http://oracle.github.io/opengrok/
Other
4.36k stars 748 forks source link

ConfigMerge should make sure the base and new configuration file paths are different #4134

Open vladak opened 1 year ago

vladak commented 1 year ago

The ConfigMerge tool should make sure that (canonicalized) paths for the base and new files are different to avoid nasty surprises.

Inspired by https://github.com/oracle/opengrok/discussions/4133#discussioncomment-4402540_

vladak commented 1 year ago

Also, the Docker scripts should check the return value of merge_config_files() and react accordingly, i.e. report the error and continue: https://github.com/oracle/opengrok/blob/c53c7ab0c2a245118f5fc53532392c76d0a89295/docker/start.py#L519-L520