From 834f83e490eb1c2907adf67a2b43a04ccd900b9e Mon Sep 17 00:00:00 2001 From: Raphaël Hertzog Date: Wed, 21 Dec 2011 10:02:36 +0100 Subject: dpkg-mergechangelogs: do not error out on invalid versions The usage of version_compare() has the side effect of erroring out as soon as you encounter an invalid version. Replacing this call with a comparison operator invoked on Dpkg::Version objects fixes the issue. Closes: #651993 Reported-by: Martin Packman --- scripts/dpkg-mergechangelogs.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/dpkg-mergechangelogs.pl') diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index a3ddeec61..1729368c7 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -179,7 +179,9 @@ sub compare_versions { $a =~ s/~[^~]*$//; $b =~ s/~[^~]*$//; } - return version_compare($a, $b); + $a = Dpkg::Version->new($a); + $b = Dpkg::Version->new($b); + return $a <=> $b; } # Merge changelog entries smartly by merging individually the different -- cgit v1.2.3