re-adding a builder causes exception in pbmanager.py

[stepchen]

I accidentally removed a builder. When I added it back and reconfigure, I got the exception below.

2012-04-10 13:56:49-0400 [-] beginning configuration update
2012-04-10 13:56:49-0400 [-] Loading configuration from '/buildbot/master.cfg'
2012-04-10 13:56:49-0400 [-] during reconfig:
	Traceback (most recent call last):
	  File "/usr/lib/python2.7/site-packages/twisted/internet/defer.py", line 989, in unwindGenerator
	    return _deferGenerator(f(*args, **kwargs), Deferred())
	  File "/usr/lib/python2.7/site-packages/twisted/internet/defer.py", line 891, in _deferGenerator
	    result = g.next()
	  File "/usr/lib/python2.7/site-packages/buildbot-0.8.6p1-py2.7.egg/buildbot/process/botmaster.py", line 168, in reconfigService
	    new_config))
	  File "/usr/lib/python2.7/site-packages/twisted/internet/defer.py", line 989, in unwindGenerator
	    return _deferGenerator(f(*args, **kwargs), Deferred())
	--- <exception caught here> ---
	  File "/usr/lib/python2.7/site-packages/twisted/internet/defer.py", line 891, in _deferGenerator
	    result = g.next()
	  File "/usr/lib/python2.7/site-packages/buildbot-0.8.6p1-py2.7.egg/buildbot/config.py", line 718, in reconfigService
	    d = svc.reconfigService(new_config)
	  File "/usr/lib/python2.7/site-packages/buildbot-0.8.6p1-py2.7.egg/buildbot/buildslave.py", line 202, in reconfigService
	    self.password, self.getPerspective)
	  File "/usr/lib/python2.7/site-packages/buildbot-0.8.6p1-py2.7.egg/buildbot/pbmanager.py", line 55, in register
	    disp.register(username, password, pfactory)
	  File "/usr/lib/python2.7/site-packages/buildbot-0.8.6p1-py2.7.egg/buildbot/pbmanager.py", line 125, in register
	    % (username, self.portstr))
	exceptions.KeyError: "username 'hostname' is already registered on PB port tcp:9989"
	
2012-04-10 13:56:49-0400 [-] WARNING: reconfig partially applied; master may malfunction

[tom.prince]

I guess you are talking about a slave rather than a builder? I think  https://github.com/tomprince/buildbot/tree/bug2280 should fix the issue.

[dustin]

Looks right to me - shall we get that merged?

[tom.prince]

I'd like to add some tests, first.

[stepchen]

I am talking about a builder. Though that's the last builder in the slave.

[Tom Prince]

Unregister slaver from PBManager when removing slave.

Fixes #2280.

Changeset: 1e35441ce175eed2b094ca12dfa9f8414c0514be

[Tom Prince]

Unregister slaver from PBManager when removing slave.

Fixes #2280.

Changeset: 1e35441ce175eed2b094ca12dfa9f8414c0514be