Bug in UpdateFromUpstream.sh

gdevenyi · August 9, 2018, 6:01pm

Not sure exactly where the bug lies, but I just triggered a bug trying to use UpdateFromUpstream.sh.

Essentially, it seems to be triggered if your CWD when you execute the script has a symlink as part of the path, in my case:

~/projects/src/ITK/Modules/ThirdParty/MINC
#projects is a symlink

This broke UpdateFromUpstream.sh in such a way that it couldn’t merge properly and ended up modifying the top-level CMakeLists.txt.

If instead I de-referenced the symlink so my CWD was real:

> cd $(realpath .)
#now in /data/chamal/projects/gabriel/src/ITK/Modules/ThirdParty/MINC

All is well.

matt.mccormick · August 10, 2018, 2:22pm

@gdevenyi good detective work

Does adding the realpath invocation here:


local module_path=$( cd "$( dirname "$0" )" && pwd )
local toplevel_path=$(cd "$module_path" && git rev-parse --show-toplevel)

fix the issue?

gdevenyi · August 10, 2018, 2:33pm

Yup, replacing pwd with realpath . fixes it.

Note: I’m not sure realpath is by default available on all systems.

matt.mccormick · August 10, 2018, 2:59pm

Great.

Please, test this patch, which uses perl to work on Linux and macOS:

dzenanz · August 10, 2018, 6:36pm

Updating from upstream is not done frequently, and it does not have to work on as many operating systems as normal ITK.