diff mbox series

[02/15] fetch2: support URL rev paramter for named URLs together with default

Message ID 20250902064515.30879-3-stefan.herbrechtsmeier-oss@weidmueller.com
State New
Headers show
Series fetch2: gitsm: rework and simplify | expand

Commit Message

Stefan Herbrechtsmeier Sept. 2, 2025, 6:45 a.m. UTC 
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>

Support the rev parameter for named SRC_URIs together with SRCREV or
SRCREV:pn-<PN>. Only raise conflicting revisions fetch error for rev
parameter and SRCREV_<NAME> or SRCREV_<NAME>:pn-<PN>

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---

 lib/bb/fetch2/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 0ad987c59..de301543a 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1226,9 +1226,10 @@  def srcrev_internal_helper(ud, d, name):
         attempts.append("SRCREV_%s:pn-%s" % (name, pn))
     if name != '':
         attempts.append("SRCREV_%s" % name)
-    if pn:
-        attempts.append("SRCREV:pn-%s" % pn)
-    attempts.append("SRCREV")
+    if name == 'default' or 'rev' not in ud.parm:
+        if pn:
+            attempts.append("SRCREV:pn-%s" % pn)
+        attempts.append("SRCREV")
 
     for a in attempts:
         srcrev = d.getVar(a)