summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:51:26 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:51:35 +0100
commit25a8dc18619262f46043974ad4de5eeaab10bf75 (patch)
treed0d513f60c1127e0d2d06984838bcbaec5499e3d
parentb3fb546c9bf124badecfa85a460f64c0c763f895 (diff)
wip, compile fixes
ready for testing: - baseline push - remote push - other stuff
-rwxr-xr-xdgit18
1 files changed, 10 insertions, 8 deletions
diff --git a/dgit b/dgit
index 08ecca6..0c024c9 100755
--- a/dgit
+++ b/dgit
@@ -1088,7 +1088,7 @@ sub push_parse_changelog ($) {
return ($clogp, $cversion, $tag, $dscfn);
}
-sub push_parse_dsc ($$) {
+sub push_parse_dsc ($$$) {
my ($dscfn,$dscfnwhat, $cversion) = @_;
$dsc = parsecontrol($dscfn,$dscfnwhat);
my $dversion = getfield $dsc, 'Version';
@@ -1114,6 +1114,8 @@ sub push_mktag ($$$$$$$$) {
" does not match changelog \`$clogp->{$field}'";
}
+ my $cversion = getfield $clogp, 'Version';
+
# We make the git tag by hand because (a) that makes it easier
# to control the "tagger" (b) we can do remote signing
my $authline = clogp_authline $clogp;
@@ -1153,7 +1155,7 @@ sub sign_changes ($) {
if ($sign) {
my @debsign_cmd = @debsign;
push @debsign_cmd, "-k$keyid" if defined $keyid;
- push @debsign_cmd, "-p$pgp[0]" if $pgp[0] ne 'gpg';
+ push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
push @debsign_cmd, $changesfile;
runcmd_ordryrun @debsign_cmd;
}
@@ -1224,7 +1226,7 @@ sub dopush () {
}
}
- responder_send_file('changes',$changesfn);
+ responder_send_file('changes',$changesfile);
my $tfn = sub { ".git/dgit/tag$_[0]"; };
my ($tagobjfn) =
@@ -1258,7 +1260,7 @@ sub dopush () {
my $dryrunsuffix = $dryrun ? ".tmp" : "";
responder_receive_files('signed-dsc-changes',
"../$dscfn$dryrunsuffix",
- "$changesfile$dryrupnsuffix");
+ "$changesfile$dryrunsuffix");
} else {
sign_changes $changesfile;
}
@@ -1383,7 +1385,7 @@ sub cmd_remote_push_responder {
die unless @rargs;
my ($dir) = @rargs;
chdir $dir or die "$dir: $!";
- $we_are_remote = 1;
+ $we_are_responder = 1;
$|=1;
responder_send_command("dgit-remote-push-ready");
&cmd_push;
@@ -1416,7 +1418,7 @@ sub cmd_rpush {
$dir =~ s{^-}{./-};
my @rargs = ($dir);
my @rdgit;
- push @rdgit, @dgit
+ push @rdgit, @dgit;
push @rdgit, @ropts;
push @rdgit, (scalar @rargs), @rargs;
push @rdgit, @ARGV;
@@ -1482,11 +1484,11 @@ sub i_localname_dsc {
($i_clogp, $i_version, $i_tag, $i_dscfn) =
push_parse_changelog 'remote-changelog.822';
die if $i_dscfn =~ m#/|^\W#;
- return $dscfn;
+ return $i_dscfn;
}
sub i_want_signed_tag {
- defined $i_param{'head'} && defined $dscfn
+ defined $i_param{'head'} && defined $i_dscfn
or badproto \*RO, "sequencing error";
my $head = $i_param{'head'};
die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;