From 9f9667eddfe943841e392acaf8f87fe4a336034b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 12 Jun 2012 17:51:08 -0700
Subject: [PATCH] Fix some logging issues.

Use __repr__ for more objects so they look better in log messages.
Fix a problem with erroneous information on the "depends on" log
message.  Fixes bug #1011908.

Change-Id: I43adc5fd0943d99dae28276b7a72009ce9f9a91c
---
 tox.ini           | 2 +-
 zuul/model.py     | 8 ++++----
 zuul/scheduler.py | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 228eab14d0..7f080ab3b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ downloadcache = ~/cache/pip
 
 [testenv:pep8]
 deps = pep8
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
+commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build .
 
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1
diff --git a/zuul/model.py b/zuul/model.py
index 5ee3d0046d..8c0f0c6490 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -24,7 +24,7 @@ class ChangeQueue(object):
         self._jobs = set()
         self.queue = []
 
-    def __str__(self):
+    def __repr__(self):
         return '<ChangeQueue %s: %s>' % (self.queue_name, self.name)
 
     def getJobs(self):
@@ -182,7 +182,7 @@ class Change(object):
             return '%s,%s' % (self.number, self.patchset)
         return self.newrev
 
-    def __str__(self):
+    def __repr__(self):
         return '<Change 0x%x %s>' % (id(self), self._id())
 
     def formatStatus(self, indent=0):
@@ -289,7 +289,7 @@ class TriggerEvent(object):
         self.oldrev = None
         self.newrew = None
 
-    def __str__(self):
+    def __repr__(self):
         ret = '<TriggerEvent %s %s' % (self.type, self.project_name)
 
         if self.branch:
@@ -314,7 +314,7 @@ class EventFilter(object):
         self.refs = [re.compile(x) for x in refs]
         self.approvals = approvals
 
-    def __str__(self):
+    def __repr__(self):
         ret = '<EventFilter'
 
         if self._types:
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 6074044dc1..ad0c032641 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -417,11 +417,13 @@ class DependentQueueManager(BaseQueueManager):
             super(DependentQueueManager, self).addChange(change)
 
     def _getDependentChanges(self, change):
+        orig_change = change
         changes = []
         while change.change_ahead:
             changes.append(change.change_ahead)
             change = change.change_ahead
-        self.log.info("Change %s depends on changes %s" % (change, changes))
+        self.log.info("Change %s depends on changes %s" % (orig_change,
+                                                           changes))
         return changes
 
     def launchJobs(self, change):