mirror of https://github.com/peridotbuild/pv2.git
Compare commits
2 Commits
01a6696adc
...
7f2004719a
Author | SHA1 | Date |
---|---|---|
Louis Abel | 7f2004719a | |
Louis Abel | c2297d6189 |
|
@ -811,7 +811,8 @@ class GitImport(Import):
|
|||
source_git_repo_spec = self.find_spec_file(source_git_repo_path)
|
||||
|
||||
# do rpm autochangelog logic here
|
||||
if HAS_RPMAUTOSPEC and os.path.exists(source_git_repo_changelog):
|
||||
#if HAS_RPMAUTOSPEC and os.path.exists(source_git_repo_changelog):
|
||||
if HAS_RPMAUTOSPEC:
|
||||
# Check that the spec file really has %autochangelog
|
||||
AUTOCHANGELOG = False
|
||||
with open(source_git_repo_spec, 'r') as spec_file:
|
||||
|
@ -1142,7 +1143,7 @@ class ModuleImport(Import):
|
|||
|
||||
with open(modulemd_file, 'r') as module_yaml:
|
||||
content = module_yaml.read()
|
||||
content_new = re.sub('ref:\s+(.*)', f'ref: {dest_branch}', content)
|
||||
content_new = re.sub(r'ref:\s+(.*)', f'ref: {dest_branch}', content)
|
||||
module_yaml.close()
|
||||
|
||||
# Write to the root
|
||||
|
|
Loading…
Reference in New Issue