dsc import: Reorganise to make room for resolve_dsc_field_commit

[dgit.git] / dgit

diff --git a/dgit b/dgit
index ca343afc87f911fb832a1b0f0b79182f075dd6f4..af9b182fcf5e7952479d8778f517f6da53e4f272 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6022,10 +6022,12 @@ sub cmd_import_dsc {
 
     parse_dscdata();
 
-    parse_dsc_field($dsc, "Dgit metadata in .dsc");
+    $package = getfield $dsc, 'Source';
+
+    parse_dsc_field($dsc, "Dgit metadata in .dsc")
+       unless forceing [qw(import-dsc-with-dgit-field)];
 
-    if (defined $dsc_hash
-       && !forceing [qw(import-dsc-with-dgit-field)]) {
+    if (defined $dsc_hash) {
        progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
        my @cmd = (qw(sh -ec),
                   "echo $dsc_hash | git cat-file --batch-check");
@@ -6058,7 +6060,6 @@ Specify  +$specbranch to overwrite, discarding existing history
 END
        if $oldhash && !$force;
 
-    $package = getfield $dsc, 'Source';
     my @dfi = dsc_files_info();
     foreach my $fi (@dfi) {
        my $f = $fi->{Filename};