From 29328242db875656b13f8401948ebae4991a0df6 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Tue, 19 Nov 2013 18:21:52 +0100 Subject: tracking: Use consignment code+label when announcing conflicts. --- modules/tracking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tracking.py b/modules/tracking.py index 6d41d37..0597832 100644 --- a/modules/tracking.py +++ b/modules/tracking.py @@ -548,7 +548,7 @@ url [TRACKINGNO] - Lists URLs for matches to the corresponding website''') # assume several packets within the same consignment was added as a consignment session.rollback() removed = True - self.irc.msg(target, '%s: \002%s\002 conflicts with another consignment' % (consignment.nick.encode('utf-8'), data.code)) + self.irc.msg(target, '%s: %s conflicts with another consignment' % (consignment.nick.encode('utf-8'), consignment)) break package = session.query(Package).filter(and_(Package.consignment_id == consignment.id, Package.code == data.code)).one() -- cgit v1.2.3