diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-24 18:15:46 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-24 18:15:46 +0100 |
commit | bf80f80d5ee38317cff7624dd9b53633e82fccda (patch) | |
tree | 6302d8a0ecbc17f1b171cb838207993fd137270d /dgit | |
parent | 10eb7774037c99711c6f8ca70b3ccfce7215b08e (diff) |
Change our .dsc field name to `Dgit'. Relevant to #720201.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -68,7 +68,7 @@ our $debug = 0; open DEBUG, ">/dev/null" or die $!; our $remotename = 'dgit'; -our $ourdscfield = 'Vcs-Dgit-Master'; +our @ourdscfield = qw(Dgit Vcs-Dgit-Master); our $branchprefix = 'dgit'; our $csuite; @@ -644,7 +644,10 @@ sub fetch_from_archive () { # ensures that lrref() is what is actually in the archive, # one way or another get_archive_dsc() or return 0; - $dsc_hash = $dsc->{$ourdscfield}; + foreach my $field (@ourdscfield) { + $dsc_hash = $dsc->{$ourdscfield}; + last if defined $dsc_hash; + } if (defined $dsc_hash) { $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'"; $dsc_hash = $&; @@ -832,7 +835,7 @@ sub dopush () { # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", # map { lref($_).":".rref($_) } # (uploadbranch()); - $dsc->{$ourdscfield} = rev_parse('HEAD'); + $dsc->{$ourdscfield[0]} = rev_parse('HEAD'); $dsc->save("../$dscfn.tmp") or die $!; if (!$changesfile) { my $multi = "../${package}_${cversion}_multi.changes"; |