Don't define GIT_ environment variables if the work directory is out-of-sync #758
Conversation
|
Sorry, this looks like some Python 3 string issues at https://github.com/conda/conda-build/pull/758/files#diff-8cf4f5bfdd4544775a2f28ef5e24b2c5R59 . Otherwise OK, thanks for fixing. |
stuarteberg
force-pushed
the
verify-git-repo
branch
from
9469820
to
89a00e6
Compare
… the current source directory has the correct git repo in it.
stuarteberg
force-pushed
the
verify-git-repo
branch
from
89a00e6
to
7ce7be2
Compare
Whoops, thanks. Fixed now. |
| d.update(**get_git_build_info(d['SRC_DIR'])) | ||
| d.update(**get_git_build_info(d['SRC_DIR'], | ||
| m.get_value('source/git_url'), | ||
| m.get_value('source/git_rev', default='master'))) |
There was a problem hiding this comment.
Is there a way to check for git_tag here, also?
There was a problem hiding this comment.
That was my first try, but it turns out git_rev is a synonym for git_tag, and it's the canonical spelling.
There was a problem hiding this comment.
Thanks for pointing that out. I just want to make sure: this fix works for people who specify git_tag in their recipe, rather than git_rev?
There was a problem hiding this comment.
Right. git_tag and git_branch are copied into git_rev (and then deleted -- git_tag is empty at this point).
There was a problem hiding this comment.
Thanks for the clarification. Merging.
There was a problem hiding this comment.
Interesting, I saw the introduction of git_rev in the docs and was wondering what was going on. Will git_tag and git_branch then be deprecated and then removed at some point.
Don't define GIT_ environment variables if the work directory is out-of-sync
Before the package source is downloaded, variables like
GIT_DESCRIBE_TAGcan be given incorrect values if a previous build left a git repo in the source directory. It's not a huge problem, but it does produce incorrect status messages until the source is finally downloaded.This PR fixes it by leaving those
GIT_variables undefined if theworkdirectory doesn't correspond to the package being built.