From patchwork Tue Jan 8 12:38:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ali Alnubani X-Patchwork-Id: 1021886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43YsPG4Jw0z9sDL for ; Tue, 8 Jan 2019 23:43:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="VMUh2Xkl"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43YsPG20S6zDqWH for ; Tue, 8 Jan 2019 23:43:14 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mellanox.com (client-ip=2a01:111:f400:fe09::609; helo=eur03-ve1-obe.outbound.protection.outlook.com; envelope-from=alialnu@mellanox.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="VMUh2Xkl"; dkim-atps=neutral Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::609]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43YsJK0pCRzDqSD for ; Tue, 8 Jan 2019 23:38:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RohYFNd8i9X+f1+q32W7oSep/kR4+3aku04TMho341k=; b=VMUh2Xkli80QrbVmhqbFWIyHvXntXb3zq+SCazDJF09qC5lRYJ80yxNzE0g1Fa7iPsNx4a1ydVV0ILYlLOn0NB1dTKs+JFaRFulykDqqZjAzqDlqbYsuXpGZoNoofm4bSXui4nrJn5kxlPb+xWZ/qRLgKPiLfUIPhwtarWPCdmM= Received: from VI1PR05MB4269.eurprd05.prod.outlook.com (52.133.12.22) by VI1PR05MB5869.eurprd05.prod.outlook.com (20.178.125.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Tue, 8 Jan 2019 12:38:47 +0000 Received: from VI1PR05MB4269.eurprd05.prod.outlook.com ([fe80::39c0:bdf5:cba0:8f14]) by VI1PR05MB4269.eurprd05.prod.outlook.com ([fe80::39c0:bdf5:cba0:8f14%5]) with mapi id 15.20.1495.011; Tue, 8 Jan 2019 12:38:47 +0000 From: Ali Alnubani To: "patchwork@lists.ozlabs.org" Subject: [PATCH] parser: Don't update person.name when they comment Thread-Topic: [PATCH] parser: Don't update person.name when they comment Thread-Index: AQHUp08ZfrTgmGmGbE2UbtXp6rKbTQ== Date: Tue, 8 Jan 2019 12:38:47 +0000 Message-ID: <20190108123834.2225-6-alialnu@mellanox.com> References: <20190108123834.2225-1-alialnu@mellanox.com> In-Reply-To: <20190108123834.2225-1-alialnu@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.11.0 x-clientproxiedby: LO2P265CA0316.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::16) To VI1PR05MB4269.eurprd05.prod.outlook.com (2603:10a6:803:40::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=alialnu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [2001:4b98:dc0:51:216:3eff:feac:53b] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR05MB5869; 6:Cb/rm//XUBzBelR2z+77Xcg2wbh9ztj/s2wmuG9N4OW9Ml8WPF+EOh6fi8jSEtUf7i+Z7Xsqxk0eX+q/Vg5VhzW864cDEMScPpdBAc/CMPspqxfxer/i2QvUV1fEL/hHCXnMAn68j+fKi/cYvByUzMpzUauM/QZO0zPzicII/WqPd3tB8XUREFyWtpi2gqVTziOub/dv6X8+v6MAyBvO8BWW+6N8hnOkt1ulpUu9vp8yUcuaj1M2Wwr7N/re2F5Oq2LBnz/SesnyfJZXo95kCZsCcd3A0whnhpslkyGh+bZk1f5L3fobowPQo2Y+XEbznbcdkhTqxyc5HMZD7DEAv3yrKHzs97zUcVsVOA1O59XGTqjorTp1MafTrfHJj7vbJErATG83gWC/EqATSBvIFqu8Ujeenx1s0w6QMHt3HhH2qHnZfrTQ3qb3JsxkCyEpOy/UF3ConLUwIdpu2HGqmA==; 5:2JajDoURZXsj47x5v7UQfbyuB4UoUufqeFmGQGe//SsaTReYcWBatDTvi0kEIjcBl7SMBHXUEL34EYgfNNviYhgcDFtMw8W30hOKilzyrCQj6PeJUVrGoSrlMNtspMUiiUfSjfjHaw/mDhxi6QewTqO0HyUI+VV7gTWa3NMgv6jzQ5QggLVzgZ3CEJXOsYkM1wbtOoXbiTuyKe8All+3ew==; 7:C7y+lwlRuy8nIlga5gea6xuRntCBZeqpmV4Ttsoz/aL8st1AlWBv2Ah9X57MEF8c63IIVJWzMx0WAPNLv26jzGfD62Jo1eViQxlK3cbme2oi5ZzA6CSwNpnNq1PP6zj3qiB+G+NRyro/BbZP93sIHw== x-ms-office365-filtering-correlation-id: bc104a5f-cc43-4e4e-0622-08d675663be2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB5869; x-ms-traffictypediagnostic: VI1PR05MB5869: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3002001)(3231475)(944501520)(52105112)(93006095)(93001095)(10201501046)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:VI1PR05MB5869; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB5869; x-forefront-prvs: 0911D5CE78 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(136003)(366004)(396003)(376002)(39860400002)(199004)(189003)(5660300001)(6512007)(6916009)(4326008)(305945005)(476003)(5640700003)(86362001)(46003)(6436002)(11346002)(446003)(2616005)(50226002)(6486002)(1730700003)(81156014)(81166006)(8676002)(486006)(8936002)(15650500001)(1076003)(68736007)(25786009)(97736004)(2906002)(106356001)(2351001)(105586002)(6506007)(386003)(186003)(76176011)(102836004)(14444005)(256004)(52116002)(2501003)(14454004)(71190400001)(71200400001)(478600001)(99286004)(316002)(6116002)(53936002)(7736002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB5869; H:VI1PR05MB4269.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: jD+0ff/N1267hG7iYeX9esrmgpYbBQ/jUbFd+zAUg+Unp2MERqQ/TjSfC+1tOyHRdQokpBHsr8gIM5HgohJyOI+RlexEAsKheB6eT5cgrHBqLK3HwOqvrHwN+uk5cGHjLXRjTkW+PWtY+vitiLDEc4wNrWV4DcsIM0ljPF4rcdKEKlMfHvnRfSDw3wRg1UXYKUbrOrqFYXXXYg9rcfRLUTXG9+QADJfWGh+wlIl6WPK+WmguPlueE6u0Cl2vwg/AjcacpPLWOC3boFE+AWS3u3yW+vG3dpmOfdJCD+rfPWZVjpUPdCu9k4sjWdi3qzMj spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc104a5f-cc43-4e4e-0622-08d675663be2 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2019 12:38:46.9915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB5869 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Monjalon Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" This patch modifies parser to not update the Person object when commenting, but only when a new submission is received. The reason behind this change is to always respect the name set in git configurations. Partially revert d018cd5be5e007 ("parsemail: Always update Person.email") Suggested-by: Thomas Monjalon Signed-off-by: Ali Alnubani --- patchwork/parser.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patchwork/parser.py b/patchwork/parser.py index 946b668..c7297ae 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -313,7 +313,7 @@ def find_series(project, mail, author): return _find_series_by_markers(project, mail, author) -def get_or_create_author(mail): +def get_or_create_author(mail, save_required=True): from_header = clean_header(mail.get('From')) if not from_header: @@ -361,10 +361,10 @@ def get_or_create_author(mail): person = Person.objects.get_or_create(email__iexact=email, defaults={'name': name, 'email': email})[0] - - if name and name != person.name: # use the latest provided name - person.name = name - person.save() + if save_required: + if name and name != person.name: # use the latest provided name + person.name = name + person.save() return person @@ -1152,7 +1152,7 @@ def parse_mail(mail, list_id=None): if not submission: return - author = get_or_create_author(mail) + author = get_or_create_author(mail, save_required=is_comment) try: comment = Comment.objects.create(