From patchwork Mon Nov 18 06:00:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 291945 X-Patchwork-Delegate: stephen.finucane@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 44AEA2C020A for ; Mon, 18 Nov 2013 17:01:07 +1100 (EST) Received: from mail-ea0-f202.google.com (mail-ea0-f202.google.com [209.85.215.202]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 5A0782C00E9 for ; Mon, 18 Nov 2013 17:01:03 +1100 (EST) Received: by mail-ea0-f202.google.com with SMTP id b10so97171eae.1 for ; Sun, 17 Nov 2013 22:00:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dJb2rtqCQsUwjlZcIq/AS9gCHCIn5lR+sw1dDQMuIGA=; b=FNKtF/Ix+MkfJmhl3WHNiq2nqFFf1RADgHV90R46x9AjPYDew5vqJn6wkoTUvcE8Lz V2QNza9cki/jZz0WPsQC4wd0VIYjdjQqbIWe6TH2XzGirfkamFCUnO4x2XvOhDjo2b5E wrtPmN05tc0+LfOfk8ugpXxQ09M6usyLoECWB4oLVECBblCZ6caI+IEo/wqjoR31gdDg 9Ze0+Jv3LAXvSoyQmyitgQeXzNNNfC7PtRDB5d/pxbxj/PvEFMYQiCi/bkZ06ABYhsxz ChWhSBVBMpPACmB6Dv2o98cWCM85nf+A1hKfBNGBj8WlSRvqzCXw5aabp5tDSNLTvOod CpZw== X-Gm-Message-State: ALoCoQl61uW1ZGrkKstuRACG2kl/Kb5HD5JXmJTfyFt4baR06uwBikHuD+G8jDeuSMu6zNqNazRRj9EyIUqcxswyY+0j180fvl8xE5m7wTR/vmGXZWV56MQu2tcjdNYalPWF8WLl6ZRLWpYA1mbp6hiB4GS/VibQOtzn81jVsjBXUhKxrOVfOaKa1Lxuw4S8GK4qWOe/IwAnSRSUjpxRzGvJeTTsqffL8Q== X-Received: by 10.180.106.161 with SMTP id gv1mr9924452wib.4.1384754458969; Sun, 17 Nov 2013 22:00:58 -0800 (PST) Received: from corp2gmr1-2.eem.corp.google.com (corp2gmr1-2.eem.corp.google.com [172.25.138.117]) by gmr-mx.google.com with ESMTPS id z4si745171eel.0.2013.11.17.22.00.58 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Nov 2013 22:00:58 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-2.eem.corp.google.com (Postfix) with ESMTP id B846A1E42E8; Sun, 17 Nov 2013 22:00:58 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 1B5F3810EC; Sun, 17 Nov 2013 22:00:58 -0800 (PST) From: Doug Anderson To: Jeremy Kerr Subject: [PATCH v2 4/5] models: Don't munge the 'From' field of patches Date: Sun, 17 Nov 2013 22:00:41 -0800 Message-Id: <1384754442-27219-5-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.4.1 In-Reply-To: <1384754442-27219-1-git-send-email-dianders@chromium.org> References: <1360972641-4086-1-git-send-email-dianders@chromium.org> <1384754442-27219-1-git-send-email-dianders@chromium.org> Cc: patchwork@lists.ozlabs.org X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" At the moment patchwork always uses the official submitter name (as patchwork understands it) as the "From" for patches that you receive. This isn't quite what users expect and has some unfortunate consequences. The biggest problem is that patchwork saves the "official" name for an email address the first time it sees an email from them. If that name is wrong (or was missing) patchwork will be confused even if future emails from this person are fixed. There are similar problems if a user changes his/her name (get married?). It seems better to just have each patch report the actual "From" that was used to send that patch. We'll still return the submitter in 'X-Patchwork-Submitter' just in case someone wants it. Reported-by: Wolfram Sang Signed-off-by: Doug Anderson --- apps/patchwork/views/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/patchwork/views/__init__.py b/apps/patchwork/views/__init__.py index a823388..215aba9 100644 --- a/apps/patchwork/views/__init__.py +++ b/apps/patchwork/views/__init__.py @@ -195,7 +195,7 @@ def patch_to_mbox(patch): mail = PatchMbox(body) mail['Subject'] = patch.name - mail['From'] = email.utils.formataddr(( + mail['X-Patchwork-Submitter'] = email.utils.formataddr(( str(Header(patch.submitter.name, mail.patch_charset)), patch.submitter.email)) mail['X-Patchwork-Id'] = str(patch.id) @@ -203,7 +203,7 @@ def patch_to_mbox(patch): mail.set_unixfrom('From patchwork ' + patch.date.ctime()) - copied_headers = ['To', 'Cc', 'Date'] + copied_headers = ['To', 'Cc', 'Date', 'From'] orig_headers = HeaderParser().parsestr(str(patch.headers)) for header in copied_headers: if header in orig_headers: