diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 20:04:58 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 20:04:58 +0100 |
commit | 2f0cebfee6ee94456b0b296ea16a30727ba9a414 (patch) | |
tree | 004f55af72b4b08c2c5fe7fb4cceb828536dd595 /dgit | |
parent | 326f8ea7f8a42e4cc3f422fea277822f82784c90 (diff) |
canon etc. fixes
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -33,6 +33,7 @@ our $sign = 1; our $dryrun = 0; our $changesfile; our $new_package = 0; +our $existing_package = 'dpkg'; our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -245,7 +246,7 @@ sub archive_query () { } sub canonicalise_suite () { - archive_query(); + archive_query() or die; } sub get_archive_dsc () { @@ -645,7 +646,7 @@ sub cmd_push { if (@ARGV==0) { $suite = $clogp->{Distribution}; if ($new_package) { - local ($package) = 'dpkg'; + local ($package) = $existing_package; # this is a hack canonicalise_suite(); } } else { @@ -665,7 +666,6 @@ sub cmd_build { my $clogp = parsechangelog(); $suite = $clogp->{Distribution}; $package = $clogp->{Source}; - canonicalise_suite(); runcmd_ordryrun qw(git-buildpackage -us -uc --git-no-sign-tags), '--git-builder=dpkg-buildpackage -i\.git/ -I.git', @@ -690,6 +690,8 @@ sub parseopts () { $om->[0] = $2; } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) { push @$om, $2; + } elsif (m/^--existing-package=(.*)/s) { + $existing_package = $1; } else { die "$_ ?"; } |