From patchwork Wed Mar 23 11:36:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8649381 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4DAA19F36E for ; Wed, 23 Mar 2016 11:39:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 735C420374 for ; Wed, 23 Mar 2016 11:38:59 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E2FE20340 for ; Wed, 23 Mar 2016 11:38:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aih5L-0007q9-40; Wed, 23 Mar 2016 11:36:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aih5J-0007pw-W8 for xen-devel@lists.xenproject.org; Wed, 23 Mar 2016 11:36:22 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id BF/AA-02874-5BF72F65; Wed, 23 Mar 2016 11:36:21 +0000 X-Env-Sender: prvs=883ac322c=Ian.Jackson@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1458732979!33274704!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39738 invoked from network); 23 Mar 2016 11:36:20 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 23 Mar 2016 11:36:20 -0000 X-IronPort-AV: E=Sophos;i="5.24,382,1454976000"; d="scan'208";a="348084474" From: Ian Jackson To: Date: Wed, 23 Mar 2016 11:36:06 +0000 Message-ID: <1458732967-19475-1-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 1/2] cri-getprevxenbranch: Only ever return xen-X.Y-testing X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Only consider xen-[0-9]* as candidates either for returning, or for matching the current branch. The effect is that attempts to ask for the `previous Xen branch' of anything other than a Xen stable branch give the latest Xen stable branch, which I think is correct. This fixes a bug where the `previous branch' of xen-unstable-smoke was considered to be xen-unstable-coverity (!) This bug would not have been of any consequence, except that the coverity tested branch name in xen.bit changed in c/s d94637b6 "coverity: run tests on smoked rather than master" and had not been created, so that cr-daily-branch would crash for most branches because the (largely irrelevant) invocation of `./ap-fetch-version-old xen-unstable-coverity' would fail. Signed-off-by: Ian Jackson --- cri-getprevxenbranch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-getprevxenbranch b/cri-getprevxenbranch index a70138e..c4e3ee5 100755 --- a/cri-getprevxenbranch +++ b/cri-getprevxenbranch @@ -7,7 +7,7 @@ p= for b in $(./mg-list-all-branches) ; do # already sorted by version case "$b" in - xen*) + xen-[0-9]*) if [ "x$b" = "x$xenbranch" ] ; then break else