From: Richard Purdie <richard.pur...@linuxfoundation.org>
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.pur...@linuxfoundation.org>
(cherry picked from commit 1adba3430faffdf6217b6a00533a3b48a9388abc)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
---
meta/lib/oeqa/utils/gitarchive.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/utils/gitarchive.py
b/meta/lib/oeqa/utils/gitarchive.py
index 10cb267dfa..a826646059 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')
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208352):
https://lists.openembedded.org/g/openembedded-core/message/208352
Mute This Topic: https://lists.openembedded.org/mt/109928066/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
