Message ID | 1498839920-17025-5-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <xen-devel-bounces@lists.xen.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEFD2603F2 for <patchwork-xen-devel@patchwork.kernel.org>; Fri, 30 Jun 2017 16:28:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C74F286A2 for <patchwork-xen-devel@patchwork.kernel.org>; Fri, 30 Jun 2017 16:28:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 511C5286B4; Fri, 30 Jun 2017 16:28:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id EC4E8286A2 for <patchwork-xen-devel@patchwork.kernel.org>; Fri, 30 Jun 2017 16:28:06 +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 <xen-devel-bounces@lists.xen.org>) id 1dQyjf-0005kY-5N; Fri, 30 Jun 2017 16:25:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <prvs=3471c4a24=Ian.Jackson@citrix.com>) id 1dQyjd-0005ii-Jb for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 16:25:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F7/4B-02185-C7B76595; Fri, 30 Jun 2017 16:25:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCIsWRWlGSWpSXmKPExsXitHSDvW5NdVi kQe9iYYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPN/ceMBbtYK772PWZpYDzM0sXIySEh4C/R /vs4E4jNJqAr0bTlL1sXIweHiICKxO29BiBhZoEFjBIPv5eAhIUFEiXuPaoECbMIqEocP3Eer JNXwFPixt1ZTBAT5STOH//JDGJzCnhJPJy2iB3EFgKqeXFuAgvIGCEBNYm56+MhWgUlTs58wg KxSULi4IsXzBMYeWchSc1CklrAyLSKUaM4tagstUjXyEQvqSgzPaMkNzEzR9fQwFgvN7W4ODE 9NScxqVgvOT93EyMwbOoZGBh3ML467neIUZKDSUmUd+W10EghvqT8lMqMxOKM+KLSnNTiQ4wy HBxKErzWVWGRQoJFqempFWmZOcAAhklLcPAoifDKBgGleYsLEnOLM9MhUqcYjTmaPmz5wsTxa sL/b0xCLHn5ealS4rwJIJMEQEozSvPgBsEi6xKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYd 5+kCk8mXklcPteAZ3CBHSK8IwQkFNKEhFSUg2Mi8RCco6dP/zpnXTGsqpy4U1SznP15xdO5Jq b91e15ZruHqdGvoSjn4vtrxr3OVn6r8++fcoh8sxtx6jNaQKyy2bfDoprWM5ZMUmg47DUdNUr b7k5PPU16pxVE+fcY/iznOXV+wUPglSWhHNvUhTltKtLlbfye3wue1e0UOEtD7HAPSEGdnxKL MUZiYZazEXFiQDuWbEVpwIAAA== X-Env-Sender: prvs=3471c4a24=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1498839926!103474145!3 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: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60048 invoked from network); 30 Jun 2017 16:25:31 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jun 2017 16:25:31 -0000 X-IronPort-AV: E=Sophos;i="5.40,287,1496102400"; d="scan'208";a="438490410" From: Ian Jackson <ian.jackson@eu.citrix.com> To: <xen-devel@lists.xenproject.org> Date: Fri, 30 Jun 2017 17:25:07 +0100 Message-ID: <1498839920-17025-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> References: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Ian Jackson <Ian.Jackson@eu.citrix.com> Subject: [Xen-devel] [OSSTEST PATCH 04/17] schema updates: mg-schema-test-database: Cope with applied updates X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion <xen-devel.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe> List-Post: <mailto:xen-devel@lists.xen.org> List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/mg-schema-test-database b/mg-schema-test-database index 0517ca3..641aadb 100755 --- a/mg-schema-test-database +++ b/mg-schema-test-database @@ -467,6 +467,9 @@ END END for table in $tables; do + case $table in + schema_updates) continue ;; + esac case " $ftables " in *" $table "*) condition="flight >= $minflight" ;; *) condition="1=1" ;;
The schema_updates table contents are written by the call to mg-schema-update. Trying to copy the contents from the source db correctly fails with duplicate key errors. So don't do that. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- mg-schema-test-database | 3 +++ 1 file changed, 3 insertions(+)