From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 18:07:32 +0000 (+0100)
Subject: Merge commit 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d342d7eb97cea451900ef654d546a1ad69a34871;hp=ad8a4f45a25d0a39f4200aff166263276247ac3e;p=dak.git

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  urgh, wrong part of the message

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index 81b54c9c..9bc75531 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1320,7 +1320,7 @@ class Upload(object):
                         sourcepkg, trans)
 
                     if current is not None:
-                        currentlymsg = "at version %s" % (current)
+                        currentlymsg = "at version %s" % (current.version)
                     else:
                         currentlymsg = "not present in testing"
 
@@ -1333,7 +1333,7 @@ Release Team, and %s is the Release-Team member responsible for it.
 Please mail debian-release@lists.debian.org or contact %s directly if you
 need further assistance.  You might want to upload to experimental until this
 transition is done."""
-                            % (source.source, currentlymsg, expected,t["rm"], t["rm"])))
+                            % (source, currentlymsg, expected,t["rm"], t["rm"])))
 
                     self.rejects.append(rejectmsg)
                     return