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 --overwrite: Check $gf->('Distribution')
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index af14e3f9183c3984374b79e874242b293e48b5ff..9cdf96b5226d80c378ec6f69eed37ad26b4f3e25 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-3799,6
+3799,7
@@
sub pseudomerge_version_check ($$) {
} else {
my $v = $i_arch_v->[0];
progress "Checking package changelog for archive version $v ...";
} else {
my $v = $i_arch_v->[0];
progress "Checking package changelog for archive version $v ...";
+ my $cd;
eval {
my @xa = ("-f$v", "-t$v");
my $vclogp = parsechangelog @xa;
eval {
my @xa = ("-f$v", "-t$v");
my $vclogp = parsechangelog @xa;
@@
-3809,12
+3810,17
@@
sub pseudomerge_version_check ($$) {
};
my $cv = $gf->('Version');
infopair_cond_equal($i_arch_v, $cv);
};
my $cv = $gf->('Version');
infopair_cond_equal($i_arch_v, $cv);
+ $cd = $gf->('Distribution');
};
if ($@) {
$@ =~ s/^dgit: //gm;
fail "$@".
"Perhaps debian/changelog does not mention $v ?";
}
};
if ($@) {
$@ =~ s/^dgit: //gm;
fail "$@".
"Perhaps debian/changelog does not mention $v ?";
}
+ fail <<END if $cd->[0] =~ m/UNRELEASED/;
+$cd->[1] is $cd->[0]
+Your tree seems to based on earlier (not uploaded) $v.
+END
}
}
}
}