X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=5ca4a817aa1ddf47c52ace3f2e36f12ae5b53391;hb=87e828d271c0f37bb33ca723fa991d6afc3ec76f;hp=fabf83bb8d96002f11c31f79f86918f592750f92;hpb=31b14133b081055c15b0f70edb9d75a85615010d;p=dgit.git diff --git a/dgit b/dgit index fabf83bb..5ca4a817 100755 --- a/dgit +++ b/dgit @@ -2763,8 +2763,8 @@ sub git_fetch_us () { } elsif ($here{$lref} eq $objid) { lrfetchref_used $fullrefname; } else { - print STDERR \ - "Not updateting $lref from $here{$lref} to $objid.\n"; + print STDERR + "Not updating $lref from $here{$lref} to $objid.\n"; } }); } @@ -2806,6 +2806,12 @@ sub parse_dsc_field ($$) { $f = $dsc->{$field}; last if defined $f; } + + my $def_dsc_distro = sub { + $dsc_distro //= cfg qw(dgit.default.old-dsc-distro + dgit.default.distro); + }; + if (!defined $f) { progress "$what: NO git hash"; } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url) @@ -2814,8 +2820,7 @@ sub parse_dsc_field ($$) { $dsc_hint_tag = [ $dsc_hint_tag ]; } elsif ($f =~ m/^\w+\s*$/) { $dsc_hash = $&; - $dsc_distro //= cfg qw(dgit.default.old-dsc-distro - dgit.default.distro); + $def_dsc_distro->(); $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'), $dsc_distro ]; progress "$what: specified git hash"; @@ -2911,7 +2916,7 @@ but we could not obtain that object anywhere. END foreach my $t (@tags) { my $fullrefname = $lrf.'/'.$t; - print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f); +# print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f); next unless $lrfetchrefs_f{$fullrefname}; next unless is_fast_fwd "$fullrefname~0", $dsc_hash; lrfetchref_used $fullrefname;