From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DE78C43334 for ; Thu, 7 Jul 2022 19:22:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8518A8456C; Thu, 7 Jul 2022 21:22:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="ooLDmheq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6428E84577; Thu, 7 Jul 2022 21:22:21 +0200 (CEST) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D407184548 for ; Thu, 7 Jul 2022 21:22:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72d.google.com with SMTP id o26so7054329qkl.6 for ; Thu, 07 Jul 2022 12:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=p3YcRFWxCKfB7YETMrGXzF2unmR4nEqW9vAvFWi14oU=; b=ooLDmheq8rblvyPYsz0un7mR8pRAFcPYkb1cRXoc/Jq6nNTj2EsyE+cejWHSH4KzeD xpCBanVKWtZ9vDeo5Os6EzJCg3CgrCZnWSiKyivetWmUjKKpWj7zjFbBebT2ZCmr58jo Fe0uukv7f9DNrJt4EBDunWMC3+Q86taLSTAPI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=p3YcRFWxCKfB7YETMrGXzF2unmR4nEqW9vAvFWi14oU=; b=rbhNT2kcmDYY3U8KE7bdXM7TYMKqcrr7UphUuNTlXCPxKXg7STgUIsDsj/e7VcZtIi qjFUTURiuhmNLtBYJ27a+spQ5+lZW5eYNLImyaK94FnhhREsI1TjkPQG+a99fe8DbnTP KjlFo2t0bShNGt6HOgqkwArxEtlZTzkWXU9ZvOxqNkhpgGn7Td81/xcxkkC2PY+5Sfp1 3SdHL5zZ/q5OVx81FpRIXlln8MgZ+LQboa3z609puww5Jb1Hh0/BPqrYK6SOBolEncJP WPKCz8JcXNmN9kbn27pYLAO7fqT17bkxfFKB+BcHT3ZUoncgmehTmDa2DktakSGd77jc o10Q== X-Gm-Message-State: AJIora+koRzyyTJGHLQyZptaYHXfyK6qjv2unv3mv5oz+1G3/cmz7Kgz LHtVxYGAJekJW43bTSCbB8q/kKa30VqCfQ== X-Google-Smtp-Source: AGRyM1utwkUMC3Bdz2G2vxvQAR3SsG6LTPiOloLUXvgjhR2cmkO6UxdYDzVbBkB7Xd3DL5N0o1vUuA== X-Received: by 2002:a05:620a:240a:b0:6af:27bc:66dc with SMTP id d10-20020a05620a240a00b006af27bc66dcmr32525260qkn.92.1657221737244; Thu, 07 Jul 2022 12:22:17 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id de4-20020a05620a370400b006b253a6dd1fsm16033171qkb.125.2022.07.07.12.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 12:22:16 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: wd@denx.de Subject: [gitdm PATCH 1/2] Merge branch 'master' into u-boot Date: Thu, 7 Jul 2022 15:22:14 -0400 Message-Id: <20220707192215.509444-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Bring us up to commit 0b8875225750 ("Allow multiple spaces within an email address") of the upstream gitdm project. Signed-off-by: Tom Rini --- So this isn't a real patch exactly. This shows what the single merge error would need to be corrected as, in order to bring our tree up to the above commit from upstream. That in turn is just doing a python3 print() rather than python2 print in the error case where we try and further correct the Funky email addresses we have, in code that was already clearly marked as local only code. The rest of those changes moved in cleanly. diff --cc database.py index f356f298c7ed,b50b70cac378..6c43dd23f55e --- a/database.py +++ b/database.py @@@ -296,56 -315,20 +315,56 @@@ def AddEmailEmployerMapping(email, empl except KeyError: EmailToEmployer[email] = [(end, empl)] +##!!wd!! +FunkyToEmail = { + # + # Known corrupted addresses. + # + 'bnemec jcrosoft.com': 'plagnioj@jcrosoft.com', + 'plagnioj at': 'plagnioj@jcrosoft.com', + 'richardretanubun at ruggedcom.com': 'richardretanubun@ruggedcom.com', + 'scn1874 at yandex.ru': 'scn1874@yandex.ru', + 'stelian cisco com': 'kotnes@cisco.com', +##!!wd!! + - def MapToEmployer (email, unknown = 0): + def MapToEmployer(email, unknown = 0): # Somebody sometimes does s/@/ at /; let's fix it. - email = email.lower ().replace (' at ', '@') + email = email.lower().replace(' at ', '@') try: return EmailToEmployer[email] except KeyError: pass - namedom = email.split ('@') - if len (namedom) < 2: - print 'Oops...funky email %s' % email + namedom = email.split('@') + if len(namedom) < 2: + print('Oops...funky email %s' % email) + ##!!wd!! + try: + email = FunkyToEmail[email] - print ' ... fixed up to %s' % email ++ print(' ... fixed up to %s' % email) + namedom = email.split ('@') + except KeyError: + return [(nextyear, GetEmployer ('Funky'))] + ##!!wd!! - return [(nextyear, GetEmployer ('Funky'))] - s = namedom[1].split ('.') - for dots in range (len (s) - 2, -1, -1): - addr = '.'.join (s[dots:]) + return [(nextyear, GetEmployer('Funky'))] + s = namedom[1].split('.') + for dots in range(len(s) - 2, -1, -1): + addr = '.'.join(s[dots:]) try: return EmailToEmployer[addr] except KeyError: