diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-07 21:28:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-07 21:28:31 +0000 |
| commit | 13bb14d4fd766b523d50a1ebbc92719fa797cbad (patch) | |
| tree | 5a15cd10c6cca93ab8897dfaec153be2a74a1668 /zuul | |
| parent | 3dfcefb494c13da48548e6ec13bf400a5504145a (diff) | |
| parent | 7b78b311b87bb134db0decf8c8608385ad3fdc15 (diff) | |
| download | zuul-13bb14d4fd766b523d50a1ebbc92719fa797cbad.tar.gz | |
Merge "Fix timer jobs getting aborted from abandoning a change"
Diffstat (limited to 'zuul')
| -rw-r--r-- | zuul/model.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zuul/model.py b/zuul/model.py index 8dc28dfbe..4d402ff9c 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -965,7 +965,8 @@ class NullChange(Changeish): return None def equals(self, other): - if (self.project == other.project): + if (self.project == other.project + and other._id() is None): return True return False |