aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-13 20:46:04 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-13 20:46:04 +0000
commit5e667559c345ac27763ba6f069a127d20ea2be18 (patch)
treeb2acd5f3e9fb857e476abbf13bc995b2ed316313
parent84b66758a7c5b57ea82a1a73c80d55bd873696fc (diff)
downloadperl-URPM-5e667559c345ac27763ba6f069a127d20ea2be18.tar
perl-URPM-5e667559c345ac27763ba6f069a127d20ea2be18.tar.gz
perl-URPM-5e667559c345ac27763ba6f069a127d20ea2be18.tar.bz2
perl-URPM-5e667559c345ac27763ba6f069a127d20ea2be18.tar.xz
perl-URPM-5e667559c345ac27763ba6f069a127d20ea2be18.zip
fix rpmEVRcmp() vs rpmEVRcompare() confusion, expose both
-rw-r--r--URPM.xs6
-rw-r--r--t/parse.t10
2 files changed, 10 insertions, 6 deletions
diff --git a/URPM.xs b/URPM.xs
index c476a34..20d4411 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -190,7 +190,6 @@ get_nvra(Header h) {
return NVRA;
}
-/* TODO: behaviour of rpmEVRcmp() & rpmEVRcompare() differs, is this correct? */
static int
do_rpmEVRcmp(const char *a, const char *b) {
int compare;
@@ -3354,6 +3353,11 @@ int
rpmEVRcmp(one, two)
char *one
char *two
+
+int
+rpmEVRcompare(one, two)
+ char *one
+ char *two
PREINIT:
int compare;
CODE:
diff --git a/t/parse.t b/t/parse.t
index 5802e9e..469a4d6 100644
--- a/t/parse.t
+++ b/t/parse.t
@@ -81,11 +81,11 @@ is("$start $end", "2 2", 'parse_headers');
# Version comparison
-ok(URPM::rpmEVRcmp("1-1mdk", "1-1mdk") == 0, "Same value = 0");
-ok(URPM::rpmEVRcmp("0:1-1mdk", "1-1mdk") == 0, "Same value, epoch 0 on left = 0");
-ok(URPM::rpmEVRcmp("1-1mdk", "1-2mdk") == -1, "Right value win = -1");
-ok(URPM::rpmEVRcmp("1-2mdk", "1-1mdk") == 1, "Left value win = 1");
-ok(URPM::rpmEVRcmp("1:1-1mdk", "2:1-1mdk") == -1, "epoch 1 vs 2 = -1");
+ok(URPM::rpmEVRcompare("1-1mdk", "1-1mdk") == 0, "Same value = 0");
+ok(URPM::rpmEVRcompare("0:1-1mdk", "1-1mdk") == 0, "Same value, epoch 0 on left = 0");
+ok(URPM::rpmEVRcompare("1-1mdk", "1-2mdk") == -1, "Right value win = -1");
+ok(URPM::rpmEVRcompare("1-2mdk", "1-1mdk") == 1, "Left value win = 1");
+ok(URPM::rpmEVRcompare("1:1-1mdk", "2:1-1mdk") == -1, "epoch 1 vs 2 = -1");
{
open(my $hdfh, "zcat hdlist.cz 2>/dev/null |") or die $!;