Small patch to prevent fighting with svn replacing a manually-removed
.ompi_ignore file. If you have an empty .ompi_unignore file (presumably alongside an .ompi_ignore file), we'll build the component. If you have a non-empty .ompi_unignore file (presumable alongside an .ompi_ignore file), and your username can be found in that file, we'll build the component. If your username is *not* the the .ompi_unignore file, we *won't* build the component. This commit was SVN r3747.
Этот коммит содержится в:
родитель
fba18a2b3a
Коммит
9e3d914e54
23
autogen.sh
23
autogen.sh
@ -448,12 +448,33 @@ process_dir() {
|
||||
*** `pwd`
|
||||
|
||||
EOF
|
||||
elif test -f .ompi_ignore; then
|
||||
elif test -f .ompi_ignore -a ! -f .ompi_unignore; then
|
||||
|
||||
# Note that if we have an empty (but existant)
|
||||
# .ompi_unignore, then we ignore the .ompi_ignore file
|
||||
# (and therefore build the component)
|
||||
|
||||
cat <<EOF
|
||||
|
||||
*** Found .ompi_ignore file -- skipping entire tree:
|
||||
*** `pwd`
|
||||
|
||||
EOF
|
||||
elif test -f .ompi_ignore -a \
|
||||
test -s .ompi_unignore -a \
|
||||
test -z "`grep $USER .ompi_unignore`" ; then
|
||||
|
||||
# If we have a non-empty .ompi_unignore and our username
|
||||
# is in there somewhere, we ignore the .ompi_ignore (and
|
||||
# therefore build the component). Otherwise, this
|
||||
# condition is true and we don't configure.
|
||||
|
||||
cat <<EOF
|
||||
|
||||
*** Found .ompi_ignore file and .ompi_unignore didn't invalidate --
|
||||
*** skipping entire tree:
|
||||
*** `pwd`
|
||||
|
||||
EOF
|
||||
elif test "$pd_abs_dir" != "$pd_ompi_topdir" -a -x autogen.sh; then
|
||||
cat <<EOF
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user