X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FVersions%2FDpkg.pm;h=aa9d9376ffb3b1ff75e97ed2f848fe5986ea4655;hb=466f7faff129a5699c7674f59900a92aa256175d;hp=9745cbb4b28ab1886b982d041050173d3b8715bf;hpb=4a68c2966473eead9748a7a576370178e7cfd9a6;p=debbugs.git diff --git a/Debbugs/Versions/Dpkg.pm b/Debbugs/Versions/Dpkg.pm index 9745cbb..aa9d937 100644 --- a/Debbugs/Versions/Dpkg.pm +++ b/Debbugs/Versions/Dpkg.pm @@ -43,7 +43,7 @@ sub parseversion ($) { $verhash{epoch} = 0; } - if ($ver =~ /(.+)-(.+)$/) + if ($ver =~ /(.+)-(.*)$/) { $verhash{version} = $1; $verhash{revision} = $2; @@ -74,7 +74,7 @@ sub verrevcmp($$) # : (x) + 256) # This comparison is out of dpkg's order to avoid # comparing things to undef and triggering warnings. - if (not defined $x) { + if (not defined $x or not length $x) { return 0; } elsif ($x eq '~') { @@ -124,7 +124,7 @@ sub verrevcmp($$) } return 1 if defined $vc and $vc =~ /^\d$/; return -1 if defined $rc and $rc =~ /^\d$/; - return $first_diff if $first_diff; + return (($first_diff > 0) ? 1 : -1) if $first_diff; } return 0; }