dgit: -wn clean check is a no-op

Handle this explicitly in the clean_tree_check conditional and in the
test suite.

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

diff --git a/dgit b/dgit
index 52ae472b14d25e256ec8f635c8eae90a82ab8a38..4587af257532c1c64036651feeb7d8c4d7fd3d85 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6242,6 +6242,7 @@ sub clean_tree_check () {
        # If we were actually cleaning these files would be summarily
        # deleted.  Since we're not, and not using the working tree
        # anyway, we can just ignore them - nothing will use them.
+    } elsif ($cleanmode eq 'none') {
     }
 }
 

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 7d0d9fddcf14d18fd8ec52287c4fe1f48e17628c..78ae236f3c2584609931ee9442508a30b4cf75bc 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -158,7 +158,7 @@ bm-compute-expected () {
                        bm-build-deps-ok || tolerate_fail=tolerate
                        echo >&4 "EXAMPLE RULES TARGET clean"
                        ;;
-       none)           ;;
+       none|Cnone)     ;;
        Cdpkg-source*)  ;; # handled below
        Cgit|Cgit-ff)   ;;
        C*)             echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;