With dgit sbuild, pass our -d before the user's arguments, so that the user can overr...

diff --git a/debian/changelog b/debian/changelog
index f9308c51e26eac9e0d7aadd18a87f1f68b9c5d87..e09cfbbfdbe3b2d09b3647d035ef7734e7b985d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ dgit (1.4~~) UNRELEASED; urgency=low
   * Cope properly with `3.0 (quilt)' with single-debian-patch.
     Closes:#796016.  (Still does not work with wheezy's dpkg-source, so
     no test case yet.)
   * Cope properly with `3.0 (quilt)' with single-debian-patch.
     Closes:#796016.  (Still does not work with wheezy's dpkg-source, so
     no test case yet.)

+  * With dgit sbuild, pass our -d before the user's arguments, so that
+    the user can override it.  Closes:#796019.

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index 7b62a66f3a1279f4710fae3e9f5db1e1e77c35b6..7b447dedaf3db59f1778918c9f6204e81db5266e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3139,7 +3139,7 @@ sub cmd_sbuild {
            unlink $cf or fail "remove $cf: $!";
        }
     }
            unlink $cf or fail "remove $cf: $!";
        }
     }

-    runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
+    runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;

     my @changesfiles = glob $pat;
     @changesfiles = sort {
        ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
     my @changesfiles = glob $pat;
     @changesfiles = sort {
        ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)