From 87e828d271c0f37bb33ca723fa991d6afc3ec76f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 Jan 2017 17:01:50 +0000
Subject: [PATCH] dgit: parse_dsc_field: Break out $def_dsc_distro

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dgit b/dgit
index 68ab4b0d..5ca4a817 100755
--- a/dgit
+++ b/dgit
@@ -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";
-- 
2.30.2