From b108f586bdd4a7cef117da3b36b2835db5185591 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Jan 31 2018 10:21:01 +0000
Subject: resolve-files.py: Favor non-compat packages over compat packages


---

diff --git a/resolve-files.py b/resolve-files.py
index e8f82f1..de5631f 100755
--- a/resolve-files.py
+++ b/resolve-files.py
@@ -294,6 +294,11 @@ def package_cmp(p1, p2):
     if a1 != 'i686' and a2 == 'i686':
         return -1
 
+    if n1.startswith('compat-') and not n2.startswith('compat-'):
+        return 1
+    elif n2.startswith('compat-') and not n1.startswith('compat-'):
+        return -1
+
     if n1 < n2:
         return -1
     elif n1 > n2: