| Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame^] | 1 | From a44e1c7060944b61680d635bba3f3cf6c6ec0fc3 Mon Sep 17 00:00:00 2001 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Sun, 19 Aug 2018 10:51:06 +0200 |
| Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 15/24] idmap: Don't silently ignore RROs with same priority |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 5 | |
| 6 | Change-Id: I64a6899f1b30e0cd9e9a872b7ca83d831f038cbe |
| 7 | --- |
| 8 | cmds/idmap/scan.cpp | 2 ++ |
| 9 | 1 file changed, 2 insertions(+) |
| 10 | |
| 11 | diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp |
| Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 12 | index 0acff23d031..d1dde52732f 100644 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 13 | --- a/cmds/idmap/scan.cpp |
| 14 | +++ b/cmds/idmap/scan.cpp |
| 15 | @@ -29,6 +29,8 @@ namespace { |
| 16 | |
| 17 | bool operator<(Overlay const& rhs) const |
| 18 | { |
| 19 | + if(rhs.priority == priority) |
| 20 | + return rhs.apk_path > apk_path; |
| 21 | return rhs.priority > priority; |
| 22 | } |
| 23 | |
| 24 | -- |
| Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 25 | 2.17.1 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 26 | |