From b1e70c513ff1fc8290fc564f871cf233d8f226c9 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 10 Jan 2012 11:08:39 +0100 Subject: [PATCH] For now, it is not necessary to make a distinction between "loginname" and "address". The definitive format is : "address;password;first name;last name". see #191 --- admin/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/models.py b/admin/models.py index 79b7aed65..46f979051 100644 --- a/admin/models.py +++ b/admin/models.py @@ -349,9 +349,9 @@ class Mailbox(DatesAware): :param line: a list containing the expected information """ - if len(line) < 5: + if len(line) < 4: raise AdminError(_("Invalid line")) - mailbox, domname = split_mailbox(line[4]) + mailbox, domname = split_mailbox(line[0]) self.address = mailbox try: self.domain = Domain.objects.get(name=domname)