chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Option parsing: Fix undefined $suite in some import-dsc.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index a0802eb6915a0657207e8f73545a7ff01e1deb37..4b088dbc316f0e8f2a3fa0d3a922895eadfd3457 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-6117,6
+6117,12
@@
sub cmd_import_dsc {
parse_dsc_field($dsc, "Dgit metadata in .dsc")
unless forceing [qw(import-dsc-with-dgit-field)];
parse_dsc_field($dsc, "Dgit metadata in .dsc")
unless forceing [qw(import-dsc-with-dgit-field)];
+ parse_dsc_field_def_dsc_distro();
+
+ $isuite = 'DGIT-IMPORT-DSC';
+ $idistro //= $dsc_distro;
+
+ notpushing();
if (defined $dsc_hash) {
progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
if (defined $dsc_hash) {
progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
@@
-6154,8
+6160,6
@@
Specify +$specbranch to overwrite, discarding existing history
END
if $oldhash && !$force;
END
if $oldhash && !$force;
- notpushing();
-
my @dfi = dsc_files_info();
foreach my $fi (@dfi) {
my $f = $fi->{Filename};
my @dfi = dsc_files_info();
foreach my $fi (@dfi) {
my $f = $fi->{Filename};