diff options
| author | Guillem Jover <guillem@debian.org> | 2010-11-25 07:57:09 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2010-11-25 07:57:09 +0100 |
| commit | 7e8695bdb8fb3a1dd4cf2ba4a48586e068fe3058 (patch) | |
| tree | 7670ca88aecef40bbbbabc36bf622d18ed6a4b2b /scripts/t/100_Dpkg_Version.t | |
| parent | 93bba14d3659578f19b5273dea2142d09a150a19 (diff) | |
| parent | 81aacd4b0a84df492d0ba33110537efb6fef836d (diff) | |
| download | dpkg-7e8695bdb8fb3a1dd4cf2ba4a48586e068fe3058.tar.gz | |
Merge branch 'sid' (through tag '1.15.8.6')
Conflicts:
debian/changelog
m4/dpkg-funcs.m4
man/dpkg.1
Diffstat (limited to 'scripts/t/100_Dpkg_Version.t')
| -rw-r--r-- | scripts/t/100_Dpkg_Version.t | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/100_Dpkg_Version.t index de0cd2200..0f4926d29 100644 --- a/scripts/t/100_Dpkg_Version.t +++ b/scripts/t/100_Dpkg_Version.t @@ -32,7 +32,7 @@ plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 11; sub dpkg_vercmp { my ($a, $cmp, $b) = @_; - return system('dpkg', '--compare-versions', $a, $cmp, $b) == 0; + return system('dpkg', '--compare-versions', '--', $a, $cmp, $b) == 0; } sub obj_vercmp { @@ -110,11 +110,11 @@ foreach my $case (@tests) { if ($truth->{$res}{$op}) { ok(version_compare_relation($a, $norm_op, $b), "$a $op $b => true"); ok(obj_vercmp($va, $op, $vb), "Dpkg::Version($a) $op Dpkg::Version($b) => true"); - ok(dpkg_vercmp($a, $op, $b), "dpkg --compare-versions $a $op $b => true"); + ok(dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => true"); } else { ok(!version_compare_relation($a, $norm_op, $b), "$a $op $b => false"); ok(!obj_vercmp($va, $op, $vb), "Dpkg::Version($a) $op Dpkg::Version($b) => false"); - ok(!dpkg_vercmp($a, $op, $b), "dpkg --compare-versions $a $op $b => false"); + ok(!dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => false"); } } } @@ -163,3 +163,4 @@ __DATA__ 1:3.8.1-1 3.8.GA-1 1 1.0.1+gpl-1 1.0.1-2 1 1a 1000a -1 +-0.6.5 0.9.1 -1 |