dkbuild: -u n'implique plus -b
This commit is contained in:
parent
e5a147351d
commit
f424f41561
18
dkbuild
18
dkbuild
|
@ -2812,7 +2812,7 @@ function build_action() {
|
||||||
action=build
|
action=build
|
||||||
[ -n "$update_src" ] || update_src=1
|
[ -n "$update_src" ] || update_src=1
|
||||||
[ "$update_src" == no ] && update_src=
|
[ "$update_src" == no ] && update_src=
|
||||||
if [ -z "$sync_src" -a -z "$build" -a -z "$push_image" ]; then
|
if [ -z "$clean_update" -a -z "$sync_src" -a -z "$build" -a -z "$push_image" ]; then
|
||||||
sync_src=1
|
sync_src=1
|
||||||
build=1
|
build=1
|
||||||
fi
|
fi
|
||||||
|
@ -2828,14 +2828,6 @@ function build_action() {
|
||||||
setarg "${TMPARGS[@]}"
|
setarg "${TMPARGS[@]}"
|
||||||
setarg "$@"
|
setarg "$@"
|
||||||
|
|
||||||
case "$action" in
|
|
||||||
clone_src)
|
|
||||||
die "Pas encore implémenté" #XXX
|
|
||||||
;;
|
|
||||||
update_src)
|
|
||||||
die "Pas encore implémenté" #XXX
|
|
||||||
;;
|
|
||||||
build)
|
|
||||||
if [ -n "$clean_update" ]; then
|
if [ -n "$clean_update" ]; then
|
||||||
edebug "clean"
|
edebug "clean"
|
||||||
_clean_git_clean -f || die
|
_clean_git_clean -f || die
|
||||||
|
@ -2847,6 +2839,14 @@ function build_action() {
|
||||||
[ -n "$build" ] && sync_src=1
|
[ -n "$build" ] && sync_src=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$action" in
|
||||||
|
clone_src)
|
||||||
|
die "Pas encore implémenté" #XXX
|
||||||
|
;;
|
||||||
|
update_src)
|
||||||
|
die "Pas encore implémenté" #XXX
|
||||||
|
;;
|
||||||
|
build)
|
||||||
default checkout checkout="$update_src"
|
default checkout checkout="$update_src"
|
||||||
default copy copy="$sync_src"
|
default copy copy="$sync_src"
|
||||||
default build build="$build" ${no_cache:+no-cache} ${pull_image:+pull} ${push_image:+push}
|
default build build="$build" ${no_cache:+no-cache} ${pull_image:+pull} ${push_image:+push}
|
||||||
|
|
Loading…
Reference in New Issue