zuul/zuul
Code Issues Proposed changes

Connection names for legacy configs

Browse Source 
It has been set like that:
connections = {'_legacy_gerrit': Connection(name='gerrit')}

This leads to that in merger.py it creates ".ssh_wrapper_gerrit" file,
basing it on key from connections dict,
but tries to use ".ssh_wrapper__legacy_gerrit", basing on connection name.

I propose to set it to "gerrit" everywhere (and the same for smtp).

Change-Id: I2c2d8bee7bcf98c5f12809f77b34e206d07b8438
This commit is contained in:
Evgeny Antyshev 2015-12-10 15:05:33 +00:00 committed by Ramy Asselin
parent 385d11e2ed
commit ccef05dede
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/lib/connections.py
View File

@ -56,11 +56,11 @@ def configure_connections(config):
if 'gerrit' in config.sections():
connections['gerrit'] = \
zuul.connection.gerrit.GerritConnection(
'_legacy_gerrit', dict(config.items('gerrit')))
'gerrit', dict(config.items('gerrit')))
if 'smtp' in config.sections():
connections['smtp'] = \
zuul.connection.smtp.SMTPConnection(
'_legacy_smtp', dict(config.items('smtp')))
'smtp', dict(config.items('smtp')))
return connections