From patchwork Wed May 8 18:06:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 242627 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id F14C32C0096 for ; Thu, 9 May 2013 04:08:45 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7332E4A1D5; Wed, 8 May 2013 20:08:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TbZ9zbkdxwpd; Wed, 8 May 2013 20:08:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B72214A1E5; Wed, 8 May 2013 20:07:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6A5344A149 for ; Wed, 8 May 2013 20:07:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BOGgcSA5Z7az for ; Wed, 8 May 2013 20:07:17 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vc0-f202.google.com (mail-vc0-f202.google.com [209.85.220.202]) by theia.denx.de (Postfix) with ESMTPS id 54A064A1B0 for ; Wed, 8 May 2013 20:06:43 +0200 (CEST) Received: by mail-vc0-f202.google.com with SMTP id gf12so204724vcb.3 for ; Wed, 08 May 2013 11:06:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=bwtTRi1kYJBdp9mDkK/UenC3RatY0HDmJaQV6nT50sk=; b=UHkhg0bDVg7RZiWKl6PP8LZNdsA62O2yu30ZQiwlg1s/4EIwvjAnEShdYO+tQI2J+r iV1FJegBu49Fdd6giVP10+VYwk+bW2r7KbR+25y9uA76ke/OxhIoVLxeAMsz1fSC/XFC DG6wfDsTM+XO0mZeNgyCIGe2EuYqPtLh6yaxlc2m2e86FhWrwuKb29SSXtKXzHOm4dM5 uA4Ib/gcoQDXfodE8HFifkr5rdqVuN4SvcY9f3pc3CUsqGZHR2pgdkpMqAb/1D6ZJj0Z rzCmfZXxtw4LJxTKocJEw0aM2QY2I64ud3BRiWnijzgQvJUZ1pjBQCezO17UN2UVAkf7 Ctuw== X-Received: by 10.236.84.177 with SMTP id s37mr4134280yhe.37.1368036402007; Wed, 08 May 2013 11:06:42 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id n23si3606555yhi.7.2013.05.08.11.06.41 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 08 May 2013 11:06:42 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.83.1]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id D745531C078; Wed, 8 May 2013 11:06:41 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id B681516098B; Wed, 8 May 2013 11:06:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 8 May 2013 11:06:07 -0700 Message-Id: <1368036368-3660-11-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368036368-3660-1-git-send-email-sjg@chromium.org> References: <1368036368-3660-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQmJ7GQmJsCBvjPWC1P9NENpGmBOnZrQf6ZLjmLpaW+szAE2KtGmFsbpRs6IxHkgiRLs/1bbeCQEoZfycJOPy7kBRidWx6N6OmTTvsZOVlIwEM4IITWbcHKhYLFTU8ffFr6h933nwBTRv303H5MiSUaypFJ7DDbiy7jV2ZHxYvkl2dKlwR8JyRiKSLIgCxniJgMxLVoh Cc: Tom Rini , u-boor-review@google.com Subject: [U-Boot] [PATCH v3 11/12] buildman: Allow conflicting tags to avoid spurious errors X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Conflicting tags can prevent buildman from building two series which exist one after the other in a branch. There is no reason not to allow this sort of workflow with buildman, so ignore conflicting tags in buildman. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None tools/buildman/control.py | 5 +++++ tools/patman/series.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8d7b9b5..1ce8b6f 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -137,6 +137,11 @@ def DoBuildman(options, args): upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch) series = patchstream.GetMetaDataForList(upstream_commit, options.git_dir, 1) + # Conflicting tags are not a problem for buildman, since it does not use + # then. For example, Series-version is not useful for buildman. On the + # other hand conflicting tags will cause an error. So allow later tags + # to overwrite earlier ones. + series.allow_overwrite = True series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None, series) diff --git a/tools/patman/series.py b/tools/patman/series.py index 783b3dd..85ed316 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -40,6 +40,7 @@ class Series(dict): notes: List of lines in the notes changes: (dict) List of changes for each version, The key is the integer version number + allow_overwrite: Allow tags to overwrite an existing tag """ def __init__(self): self.cc = [] @@ -49,6 +50,7 @@ class Series(dict): self.cover = None self.notes = [] self.changes = {} + self.allow_overwrite = False # Written in MakeCcFile() # key: name of patch file @@ -72,7 +74,7 @@ class Series(dict): """ # If we already have it, then add to our list name = name.replace('-', '_') - if name in self: + if name in self and not self.allow_overwrite: values = value.split(',') values = [str.strip() for str in values] if type(self[name]) != type([]):