From e092d24fe9fdf4d01d2d9c8752c7036982973af1 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 20 Nov 2009 12:40:09 -0800 Subject: [PATCH] Switch Builder.compareToSetup function to just use a comparison on the locks list. This is more uniform and fixes a crash trying to access the .name field of LockAccess variables; I'm not sure why this was doing the comparison manually in the first place... --- buildbot/process/builder.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/buildbot/process/builder.py b/buildbot/process/builder.py index a15c21b4777..bb16c659c33 100644 --- a/buildbot/process/builder.py +++ b/buildbot/process/builder.py @@ -438,12 +438,8 @@ def compareToSetup(self, setup): % (self.slavebuilddir, setup['slavebuilddir'])) if setup['factory'] != self.buildFactory: # compare objects diffs.append('factory changed') - oldlocks = [(lock.__class__, lock.name) - for lock in self.locks] - newlocks = [(lock.__class__, lock.name) - for lock in setup.get('locks',[])] - if oldlocks != newlocks: - diffs.append('locks changed from %s to %s' % (oldlocks, newlocks)) + if setup.get('locks', []) != self.locks: + diffs.append('locks changed from %s to %s' % (self.locks, setup.get('locks'))) if setup.get('nextSlave') != self.nextSlave: diffs.append('nextSlave changed from %s to %s' % (self.nextSlave, setup['nextSlave'])) if setup.get('nextBuild') != self.nextBuild: