29afe98686
Add all patches since 5.1.20 was released.
34 lines
992 B
Diff
34 lines
992 B
Diff
From 941f72d05302d265af763c7f8ed6b999e4f85eeb Mon Sep 17 00:00:00 2001
|
|
From: Pino Toscano <ptoscano@redhat.com>
|
|
Date: Fri, 12 Apr 2019 11:58:49 +0200
|
|
Subject: [PATCH 05/12] rpm: do not unpack parameters
|
|
|
|
They will be used as parameters again soon.
|
|
|
|
This has no behaviour changes.
|
|
---
|
|
src/ph_rpm.ml | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
|
|
index 3ff5c94..6769e7b 100644
|
|
--- a/src/ph_rpm.ml
|
|
+++ b/src/ph_rpm.ml
|
|
@@ -144,10 +144,10 @@ let rpm_package_of_string str =
|
|
* interested in the highest version with the best
|
|
* architecture.
|
|
*)
|
|
- let cmp { version = v1; arch = a1 } { version = v2; arch = a2 } =
|
|
- let i = rpm_vercmp v2 v1 in
|
|
+ let cmp pkg1 pkg2 =
|
|
+ let i = rpm_vercmp pkg2.version pkg1.version in
|
|
if i <> 0 then i
|
|
- else compare_architecture a2 a1
|
|
+ else compare_architecture pkg2.arch pkg1.arch
|
|
in
|
|
let rpms = List.sort cmp rpms in
|
|
List.hd rpms
|
|
--
|
|
2.23.0
|
|
|