diff options
Diffstat (limited to 'meta/lib/oeqa/utils/gitarchive.py')
-rw-r--r-- | meta/lib/oeqa/utils/gitarchive.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 10cb267dfa..7e1d505748 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): | |||
67 | 67 | ||
68 | # Remove files that are excluded | 68 | # Remove files that are excluded |
69 | if exclude: | 69 | if exclude: |
70 | repo.run_cmd(['rm', '--cached'] + [f for f in exclude], env_update) | 70 | repo.run_cmd(['rm', '--cached', '--ignore-unmatch'] + [f for f in exclude], env_update) |
71 | 71 | ||
72 | tree = repo.run_cmd('write-tree', env_update) | 72 | tree = repo.run_cmd('write-tree', env_update) |
73 | 73 | ||
@@ -146,7 +146,7 @@ def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, | |||
146 | keyws['tag_number'] = '{tag_number}' | 146 | keyws['tag_number'] = '{tag_number}' |
147 | tag_re = format_str(name_pattern, keyws) | 147 | tag_re = format_str(name_pattern, keyws) |
148 | # Replace parentheses for proper regex matching | 148 | # Replace parentheses for proper regex matching |
149 | tag_re = tag_re.replace('(', '\(').replace(')', '\)') + '$' | 149 | tag_re = tag_re.replace('(', r'\(').replace(')', r'\)') + '$' |
150 | # Inject regex group pattern for 'tag_number' | 150 | # Inject regex group pattern for 'tag_number' |
151 | tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') | 151 | tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') |
152 | 152 | ||
@@ -202,6 +202,8 @@ def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_ms | |||
202 | log.info("Pushing data to remote") | 202 | log.info("Pushing data to remote") |
203 | data_repo.run_cmd(cmd) | 203 | data_repo.run_cmd(cmd) |
204 | 204 | ||
205 | return tag_name | ||
206 | |||
205 | # Container class for tester revisions | 207 | # Container class for tester revisions |
206 | TestedRev = namedtuple('TestedRev', 'commit commit_number tags') | 208 | TestedRev = namedtuple('TestedRev', 'commit commit_number tags') |
207 | 209 | ||