From patchwork Sat Apr 4 21:28:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2125 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338289; bh=cIxok7cRAO3IWI3HuEamQ1w6Ri85Jmg1yW2ArQNwJtw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=IxBUnHDPfOO/sUYikZjKAqsewaEB9ESQxF64KFoJj77/Zp8utffaZlBM+us+12I0O jpJyPDAaM8mtm7HB/GKMf3bZCfqEMyy9KK97JW0Y0Kwg0lPn/wZbrV8LLPiAok5rcL 0w1EYws6QPJL5xIK44vipRJfObUPka0vboQZCxreJcWrsXI5jGDyu/HxZ4u2VpZm9J D3pfYx/fOXiQdEv+04FciTR+b1hRbVM0/NXqZR+lx6foAf0y75y+JcI9NqgPm9G93F Bp/Otg35gi2tW50pMbQYFyJQsFbrQHfEekFHvsvyPHmFW2dPxsobhG8spH4Qu7IQ3C 7TVeTKgg/IAHw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 374816A37F for ; Sat, 4 Apr 2026 15:31:29 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0nLxjOsnM70o for ; Sat, 4 Apr 2026 15:31:29 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338289; bh=cIxok7cRAO3IWI3HuEamQ1w6Ri85Jmg1yW2ArQNwJtw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=IxBUnHDPfOO/sUYikZjKAqsewaEB9ESQxF64KFoJj77/Zp8utffaZlBM+us+12I0O jpJyPDAaM8mtm7HB/GKMf3bZCfqEMyy9KK97JW0Y0Kwg0lPn/wZbrV8LLPiAok5rcL 0w1EYws6QPJL5xIK44vipRJfObUPka0vboQZCxreJcWrsXI5jGDyu/HxZ4u2VpZm9J D3pfYx/fOXiQdEv+04FciTR+b1hRbVM0/NXqZR+lx6foAf0y75y+JcI9NqgPm9G93F Bp/Otg35gi2tW50pMbQYFyJQsFbrQHfEekFHvsvyPHmFW2dPxsobhG8spH4Qu7IQ3C 7TVeTKgg/IAHw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 258376A375 for ; Sat, 4 Apr 2026 15:31:29 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338286; bh=CmnMBPyuV9EJIbqnchqzagxpjvm9zkfVQkYC45IzBXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k8Dhd+TOyX6eRu3J5hIRNbnlUkY93RhR80kYW2A7H+g8aTdOngJtCDMriSVCHFn8O 5rBU5M48xUm27UK37kfIEEHoJR7RILogtOIao758xjM+cRaIXb4Lg65sA+kgd2/pS5 XFIzhQQV3u7YEF9PfwafSbqKeiDjr2ZV59VoCHyMD7YeFJhSrCiM5IGdd32ou6omX0 eJjiTdGrMSc8+PicRGxzLygh0PmUPe7WcpQF7Yb/v7HN+9lNXaNx9WrxdVo3i6Y+rX /cqBtTN7rfvD/xvWMA7EFQRmvm97aZw4cqqyfF5tFeXlVykSZuvMsZS8ia+tOqmCAE g59P/yciRAniQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CAE756A369; Sat, 4 Apr 2026 15:31:26 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id mRzwwgW4krYW; Sat, 4 Apr 2026 15:31:26 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338282; bh=PZsftRuf6walNoUIFPbJVRJ89vsIgstoUIKBnaQgLxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dG2NEIwbUiZsZ6+C2v/NsHdzCR2vDc3ZN85h6fpAT+uI1qiFsY4Dcl/ac0uTKWonE ZmdSouQYGlCtT62TuZ0oZ8bFbe0tcjRg1GqS98e+syqy9Gda60chxErth/cgipZk/t vlFlWggzSh2nxa+JQpR+7EVWsGht5qOy8UgJxXMEVUcXA6WYNoCMK90dGEbmf6VFyl zs4rcJISRswvNAM4XOApH32NHv5Wykq7ADZUeT9L8HRb0rTp2U8nZ1iQSILaKZvt3s EPNKEMck/Jv8UUQmgl0vk9q7Tn+c99xlzB4/4NUlzKOB4ibGNV6wAKKZtPwPoAi4xN GXEzunlJn3h1w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 084386869D; Sat, 4 Apr 2026 15:31:21 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Sat, 4 Apr 2026 15:28:46 -0600 Message-ID: <20260404213020.372253-11-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260404213020.372253-1-sjg@u-boot.org> References: <20260404213020.372253-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: WYDVSPUKGNXJRTEBXXQ6FTJD4J7EA2UO X-Message-ID-Hash: WYDVSPUKGNXJRTEBXXQ6FTJD4J7EA2UO X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 10/37] patman: Fix autolink to prefer per-upstream patchwork URL List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass When a default patchwork-url is set in ~/.patman, _setup_patchwork() only checks the per-upstream URL when no default is configured. This causes autolink to search the wrong patchwork server when the series has a specific upstream with its own URL. Fix _setup_patchwork() to always check the per-upstream URL and override the config default when one is found. Warn when the upstream URL differs from the configured default. Signed-off-by: Simon Glass --- tools/patman/control.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/patman/control.py b/tools/patman/control.py index 53963713a8b..a37893785ad 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -128,16 +128,28 @@ def _setup_patchwork(cser, pwork, ups, pw_url): """ if pwork: return pwork - if not pw_url and ups: - pw_url = cser.db.upstream_get_patchwork_url(ups) + tout.debug(f'_setup_patchwork: ups={ups!r} pw_url={pw_url!r}') + if ups: + ups_url = cser.db.upstream_get_patchwork_url(ups) + if ups_url: + if pw_url and pw_url != ups_url: + tout.info(f' Overriding {pw_url!r} with upstream' + f' {ups!r} URL {ups_url!r}') + pw_url = ups_url + tout.debug(f' URL from upstream {ups!r}: {pw_url!r}') if not pw_url: raise ValueError( 'No patchwork URL found; use -U/--upstream or ' "configure with 'patman upstream add'") pwork = Patchwork(pw_url) proj = cser.project_get(ups) + tout.debug(f' project_get({ups!r}): {proj!r}') if not proj: proj = cser.project_get() + tout.debug(f' project_get(None) fallback: {proj!r}') + if proj: + tout.warning(f"No patchwork project for upstream '{ups}';" + f' using default project {proj[0]} (ID {proj[1]})') if not proj: raise ValueError( "Patchwork project not configured; use "