summaryrefslogtreecommitdiff
path: root/scripts/dpkg-gencontrol.pl
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2012-07-02 21:13:41 +0200
committerRaphaël Hertzog <hertzog@debian.org>2012-07-02 21:13:41 +0200
commitc140193701a69b95d974f5ec128a7cea323b5da7 (patch)
tree80e57761a7cacefeff1317fd4276b1562f79f373 /scripts/dpkg-gencontrol.pl
parent39d412af305d9b93c2723161cf7b3b98fa558b0a (diff)
downloaddpkg-c140193701a69b95d974f5ec128a7cea323b5da7.tar.gz
dpkg-gencontrol: fix handling of "old-style" bin-nmus
With old style bin-nmus, the source version is extrapolated from the binary version and thus we need to retrieve the correct source version from Dpkg::Substvars instead of assuming that what we submitted has been unchanged. Regression introduced in commit 094d3a7e61e6fc1f5634d880957d18ed70954a60. Reported-by: Julien Cristau <jcristau@debian.org> Closes: #679959
Diffstat (limited to 'scripts/dpkg-gencontrol.pl')
-rwxr-xr-xscripts/dpkg-gencontrol.pl4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index c1b5786b8..8df486e49 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -161,6 +161,10 @@ $substvars->load("debian/substvars") if -e "debian/substvars" and not $substvars
my $control = Dpkg::Control::Info->new($controlfile);
my $fields = Dpkg::Control->new(type => CTRL_PKG_DEB);
+# Old-style bin-nmus change the source version submitted to
+# set_version_substvars()
+$sourceversion = $substvars->get("source:Version");
+
my $pkg;
if (defined($oppackage)) {