#----- other building -----
sub clean_tree_check () {
- # Not yet implemented. The lack of this is part of #910705.
+ # Not yet fully implemented.
+ if ($cleanmode eq 'check') {
+ my $leftovers = cmdoutput @git, qw(clean -xdn);
+ if (length $leftovers) {
+ print STDERR $leftovers, "\n" or confess $!;
+ fail __
+ "tree contains uncommitted files and --clean=check specified";
+ }
+ }
}
sub clean_tree () {
} elsif ($cleanmode eq 'git-ff') {
runcmd_ordryrun_local @git, qw(clean -xdff);
} elsif ($cleanmode eq 'check') {
- my $leftovers = cmdoutput @git, qw(clean -xdn);
- if (length $leftovers) {
- print STDERR $leftovers, "\n" or confess $!;
- fail __
- "tree contains uncommitted files and --clean=check specified";
- }
+ clean_tree_check();
} elsif ($cleanmode eq 'none') {
} else {
die "$cleanmode ?";
*[^\ ]*)
;;
*)
- # dgit won't bother cleaning the tree
- # if no build is going to be run
- eff_cleanmode=none
+ # if no build is going to be run, dgit will only check
+ # cleanliness rather than actually cleaning
+ eff_cleanmode=C$cleanmode
;;
esac
case "$act" in
sbuild*)
- # dgit sbuild won't bother cleaning the tree
+ # dgit sbuild will only check cleanliness
# because it doesn't need to to make a .dsc for sbuild
- eff_cleanmode=none
+ eff_cleanmode=C$cleanmode
;;
esac
case $eff_cleanmode in
git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
git-ff) echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
- check) echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
+ check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
dpkg-source-d) echo >&4 "EXAMPLE RULES TARGET clean" ;;
dpkg-source) bm-build-deps-ok || tolerate_fail=tolerate
echo >&4 "EXAMPLE RULES TARGET clean"
;;
none) ;;
+ C*) echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
*) fail "t-compute-expected-run $cleanmode ??" ;;
esac