X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=a0802eb6915a0657207e8f73545a7ff01e1deb37;hb=306828d91540e9ce11cafc701d7021845610d14b;hp=fabf83bb8d96002f11c31f79f86918f592750f92;hpb=31b14133b081055c15b0f70edb9d75a85615010d;p=dgit.git

diff --git a/dgit b/dgit
index fabf83bb..a0802eb6 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";
 	}
     });
 }
@@ -2799,6 +2799,11 @@ sub fetch_from_archive_record_2 ($) {
     }
 }
 
+sub parse_dsc_field_def_dsc_distro () {
+    $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
+			   dgit.default.distro);
+}
+
 sub parse_dsc_field ($$) {
     my ($dsc, $what) = @_;
     my $f;
@@ -2806,16 +2811,17 @@ sub parse_dsc_field ($$) {
 	$f = $dsc->{$field};
 	last if defined $f;
     }
+
     if (!defined $f) {
 	progress "$what: NO git hash";
+	parse_dsc_field_def_dsc_distro();
     } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
 	     = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
 	progress "$what: specified git info ($dsc_distro)";
 	$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);
+	parse_dsc_field_def_dsc_distro();
 	$dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
 			  $dsc_distro ];
 	progress "$what: specified git hash";
@@ -2911,7 +2917,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;