Commit 37bd2c21 authored by Benjamin Blanc's avatar Benjamin Blanc

testnode: restore revision usage in software.cfg

parent 0ec8eaf7
...@@ -244,12 +244,12 @@ extends = %(temp_dir)s/testnode/foo/rep0/software.cfg ...@@ -244,12 +244,12 @@ extends = %(temp_dir)s/testnode/foo/rep0/software.cfg
[rep1] [rep1]
repository = <obfuscated_url>/rep1/rep1.git repository = <obfuscated_url>/rep1/rep1.git
branch = master revision = %(revision1)s
ignore-ssl-certificate = true ignore-ssl-certificate = true
[rep2] [rep2]
repository = <obfuscated_url>/rep2/rep2.git repository = <obfuscated_url>/rep2/rep2.git
branch = foo revision = %(revision2)s
ignore-ssl-certificate = true ignore-ssl-certificate = true
""" % {'temp_dir': self._temp_dir, 'revision1': revision1, 'revision2': revision2} """ % {'temp_dir': self._temp_dir, 'revision1': revision1, 'revision2': revision2}
self.assertEquals(expected_profile, profile.read()) self.assertEquals(expected_profile, profile.read())
......
...@@ -167,10 +167,10 @@ extends = %(software_config_path)s ...@@ -167,10 +167,10 @@ extends = %(software_config_path)s
profile_content_list.append(""" profile_content_list.append("""
[%(buildout_section_id)s] [%(buildout_section_id)s]
repository = <obfuscated_url>/%(buildout_section_id)s/%(buildout_section_id)s.git repository = <obfuscated_url>/%(buildout_section_id)s/%(buildout_section_id)s.git
branch = %(branch)s revision = %(revision)s
ignore-ssl-certificate = true ignore-ssl-certificate = true
""" % {'buildout_section_id': buildout_section_id, """ % {'buildout_section_id': buildout_section_id,
'branch' : vcs_repository.get('branch','master')}) 'revision': revision_dict[buildout_section_id]})
else: else:
profile_content_list.append(""" profile_content_list.append("""
[%(buildout_section_id)s] [%(buildout_section_id)s]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment