diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 19:51:10 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-17 19:51:10 +0100 |
commit | 1ce58351167dc6e9410f07bc4989f7c21940ba22 (patch) | |
tree | 4a1541438822e5cb68e1002b8ecb5a55a93c1584 | |
parent | 5836eed46bf0e2524345391559d06ece34281f43 (diff) |
fix build to canonicalisedebian/0.3
-rwxr-xr-x | dgit | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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 { |