chiark / gitweb /
fix build to canonicalise debian/0.3
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 18:51:10 +0000 (19:51 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Aug 2013 18:51:10 +0000 (19:51 +0100)
dgit

diff --git a/dgit b/dgit
index 8b39547..ab3d593 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -785,12 +785,14 @@ sub cmd_build {
     my $clogp = parsechangelog();
     $isuite = $clogp->{Distribution};
     $package = $clogp->{Source};
-    canonicalise_suite() unless grep { m/^--git-debian-branch/ } @ARGV;
-    runcmd_ordryrun
-       qw(git-buildpackage -us -uc --git-no-sign-tags),
-       '--git-builder=dpkg-buildpackage -i\.git/ -I.git',
-       "--git-debian-branch=".lbranch(),
-       @ARGV;
+    my @cmd =
+       (qw(git-buildpackage -us -uc --git-no-sign-tags),
+        '--git-builder=dpkg-buildpackage -i\.git/ -I.git');
+    unless (grep { m/^--git-debian-branch/ } @ARGV) {
+       canonicalise_suite();
+       push @cmd, "--git-debian-branch=".lbranch();
+    }
+    runcmd_ordryrun @cmd, @ARGV;
 }
 
 sub cmd_quilt_fixup {