From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 22 Nov 2024 16:06:23 +0000 (+0000)
Subject: oeqa/utils/gitarchive: Return tag name and improve exclude handling
X-Git-Tag: yocto-5.2~1238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1adba3430faffdf6217b6a00533a3b48a9388abc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oeqa/utils/gitarchive: Return tag name and improve exclude handling

Tweak the gitarchive exclude handling not to error if excluded files
don't match.

Also return the tagname created so that other code can then use it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py
index 10cb267dfa9..a826646059a 100644
--- a/meta/lib/oeqa/utils/gitarchive.py
+++ b/meta/lib/oeqa/utils/gitarchive.py
@@ -67,7 +67,7 @@ def git_commit_data(repo, data_dir, branch, message, exclude, notes, log):
 
         # Remove files that are excluded
         if exclude:
-            repo.run_cmd(['rm', '--cached'] + [f for f in exclude], env_update)
+            repo.run_cmd(['rm', '--cached', '--ignore-unmatch'] + [f for f in exclude], env_update)
 
         tree = repo.run_cmd('write-tree', env_update)
 
@@ -202,6 +202,8 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms
         log.info("Pushing data to remote")
         data_repo.run_cmd(cmd)
 
+    return tag_name
+
 # Container class for tester revisions
 TestedRev = namedtuple('TestedRev', 'commit commit_number tags')