From patchwork Tue Oct 31 13:51:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10034599 Return-Path: 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 83DE0602B9 for ; Tue, 31 Oct 2017 14:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D24128AA4 for ; Tue, 31 Oct 2017 14:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5210928AD6; Tue, 31 Oct 2017 14:00:48 +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 497B92842E for ; Tue, 31 Oct 2017 14:00:47 +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 1e9X3l-0003U6-Rt; Tue, 31 Oct 2017 13:58:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9X3k-0003T3-JH for xen-devel@lists.xenproject.org; Tue, 31 Oct 2017 13:58:28 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 93/51-23912-38188F95; Tue, 31 Oct 2017 13:58:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXitHRDpG5z449 Ig5X9Chbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aTlxdYCi6xVSzY9YS9gXEbaxcjB4eEgL/E vLWhXYycHGwCyhI/O3vZQGwRAT2JpgPPGUFsZgE7ieZHH1hAbGGBcIkz26+D1bAIqErsvLifF cTmFbCUWLhpOjOILSEgL7Gr7SJYnBMovv5pEzuILSRgIXFv2XdGCFtBomP6MSaIXkGJkzOfsE DskpA4+OIF8wRG3llIUrOQpBYwMq1i1ChOLSpLLdI1NtBLKspMzyjJTczM0TU0MNXLTS0uTkx PzUlMKtZLzs/dxAgMnXoGBsYdjBNW+R1ilORgUhLl3en4PVKILyk/pTIjsTgjvqg0J7X4EKMM B4eSBK9Dw49IIcGi1PTUirTMHGAQw6QlOHiURHi5QdK8xQWJucWZ6RCpU4yWHDceXv/DxNFx8 y6QfDbzdQOzEEtefl6qlDhvGkiDAEhDRmke3DhYpF1ilJUS5mVkYGAQ4ilILcrNLEGVf8Uozs GoJMzLATKFJzOvBG7rK6CDmIAO8pIAO6gkESEl1cBY2OOrUfz+o5//Jb7Dj04t3ndf8orgBUc Dg13bvDWOXd4mf2TPc43qGZ+jE5eFPyzlbp9+o3j1nN77D5oXrIo9FNEbHe229M6VLZJ+NzwT vOaylnK4xRo9sfD6lbRUXSbVeNFUiXVdtnKNvtN7Trxzj/ny7IHYQu7OJL3uTwff6va/fBaid F5LiaU4I9FQi7moOBEALuUh0a8CAAA= X-Env-Sender: prvs=470789eaf=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1509458299!109585852!4 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13102 invoked from network); 31 Oct 2017 13:58:27 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 31 Oct 2017 13:58:27 -0000 X-IronPort-AV: E=Sophos;i="5.44,324,1505779200"; d="scan'208";a="449213341" From: Wei Liu To: Xen-devel Date: Tue, 31 Oct 2017 13:51:57 +0000 Message-ID: <20171031135203.11537-14-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171031135203.11537-1-wei.liu2@citrix.com> References: <20171031135203.11537-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, Wei Liu Subject: [Xen-devel] [OSSTEST PATCH v2 13/19] TestSupport: add dpkg option when installing packages 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-Virus-Scanned: ClamAV using ClamSMTP Upgrading configuration file of nbd-client is controlled by dpkg in stretch. Add dpkg option to keep old configuration file(s). Signed-off-by: Wei Liu --- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 6d5e667..238be9e 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -527,7 +527,8 @@ sub target_run_apt { my ($ho, @aptopts) = @_; target_cmd_root($ho, "DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y \\ - with-lock-ex -w /var/lock/osstest-apt apt-get @aptopts", 3000); + with-lock-ex -w /var/lock/osstest-apt \\ + apt-get -o Dpkg::Options::=\"--force-confold\" @aptopts", 3000); } sub target_install_packages { my ($ho, @packages) = @_;