dgit: clean_tree_check: Reorganise command construction

This will make it easier to make the command vary.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index 1d0fe8573d0b76ba0f7c8366bcb39325b64fcced..6cf10fb4deb2f6add3a267532a207ab193f33e84 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6205,7 +6205,9 @@ sub clean_tree_check () {
     # That was done by check_not_dirty, and by now we may have run
     # the rules clean target which might modify tracked files (!)
     if ($cleanmode =~ m{^check}) {
     # That was done by check_not_dirty, and by now we may have run
     # the rules clean target which might modify tracked files (!)
     if ($cleanmode =~ m{^check}) {

-       my $leftovers = cmdoutput @git, qw(clean -xdn);
+       my @cmd = (@git, qw(clean -dn));
+       push @cmd, qw(-x);
+       my $leftovers = cmdoutput @cmd;

        if (length $leftovers) {
            print STDERR $leftovers, "\n" or confess $!;
            fail __
        if (length $leftovers) {
            print STDERR $leftovers, "\n" or confess $!;
            fail __

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5e186b2698ece154ed68a9be7bc0d6cc7e8e5da9..403d8b26d98e8ff8355221dafa52adf6f3a4c284 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -148,7 +148,7 @@ bm-compute-expected () {
        case $eff_cleanmode in
        git)            echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
        git-ff)         echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
        case $eff_cleanmode in
        git)            echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
        git-ff)         echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;

-       check|Ccheck)   echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
+       check|Ccheck)   echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;

        dpkg-source-d)  echo >&4 "EXAMPLE RULES TARGET clean" ;;
        dpkg-source)    bm-build-deps-ok || tolerate_fail=tolerate
                        echo >&4 "EXAMPLE RULES TARGET clean"
        dpkg-source-d)  echo >&4 "EXAMPLE RULES TARGET clean" ;;
        dpkg-source)    bm-build-deps-ok || tolerate_fail=tolerate
                        echo >&4 "EXAMPLE RULES TARGET clean"