public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Owen W. Taylor <otaylor@fishsoup.net>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: resolve-files.py: Favor non-compat packages over compat packages
Date: Fri, 11 Sep 2026 14:40:11 GMT	[thread overview]
Message-ID: <178913761151.1.18216853478836716305.flatpaks-flatpak-runtime-b108f586bdd4@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : b108f586bdd4a7cef117da3b36b2835db5185591
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2018-01-31T11:21:01+01:00
Stats  : +5/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/b108f586bdd4a7cef117da3b36b2835db5185591?branch=f45

Log:
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:

                 reply	other threads:[~2026-09-11 14:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178913761151.1.18216853478836716305.flatpaks-flatpak-runtime-b108f586bdd4@fedoraproject.org \
    --to=otaylor@fishsoup.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox