From patchwork Fri Jul 29 10:01:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Weglicki, MichalX" X-Patchwork-Id: 654072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3s144p0dKCz9t25 for ; Fri, 29 Jul 2016 20:01:30 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 201F01140E; Fri, 29 Jul 2016 03:01:29 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 1FD2C1140C for ; Fri, 29 Jul 2016 03:01:28 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 9D12716244D for ; Fri, 29 Jul 2016 04:01:27 -0600 (MDT) X-ASG-Debug-ID: 1469786486-0b323747723a8980001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar6.cudamail.com with ESMTP id j2fizgSu7FQyzbx9 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 29 Jul 2016 04:01:26 -0600 (MDT) X-Barracuda-Envelope-From: mweglicx@ecsmtp.ir.intel.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO mga03.intel.com) (134.134.136.65) by mx3-pf1.cudamail.com with SMTP; 29 Jul 2016 10:01:26 -0000 Received-SPF: none (mx3-pf1.cudamail.com: domain at ecsmtp.ir.intel.com does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 134.134.136.65 X-Barracuda-RBL-IP: 134.134.136.65 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 29 Jul 2016 03:01:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,438,1464678000"; d="scan'208"; a="1004796206" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 29 Jul 2016 03:01:25 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u6TA1OPk002179; Fri, 29 Jul 2016 11:01:24 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u6TA1OTY003766; Fri, 29 Jul 2016 11:01:24 +0100 Received: (from mweglicx@localhost) by sivswdev02.ir.intel.com with id u6TA1OVB003762; Fri, 29 Jul 2016 11:01:24 +0100 X-CudaMail-Envelope-Sender: mweglicx@ecsmtp.ir.intel.com From: mweglicx To: dev@openvswitch.org X-CudaMail-MID: CM-V1-728002662 X-CudaMail-DTE: 072916 X-CudaMail-Originating-IP: 134.134.136.65 Date: Fri, 29 Jul 2016 11:01:08 +0100 X-ASG-Orig-Subj: [##CM-V1-728002662##][PATCH] ovs-bugtool: Correct "rmdir" error messages during "make distcheck". Message-Id: <1469786468-3714-1-git-send-email-michalx.weglicki@intel.com> X-Mailer: git-send-email 1.7.4.1 X-GBUdb-Analysis: 0, 134.134.136.65, Ugly c=0.279065 p=-0.0666667 Source Normal X-MessageSniffer-Rules: 0-0-0-3677-c X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1469786486 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.31601 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Subject: [ovs-dev] [PATCH] ovs-bugtool: Correct "rmdir" error messages during "make distcheck". X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Remove duplicated delete attempts and error messages during distcheck clean procedure. Signed-off-by: Michal Weglicki --- utilities/bugtool/automake.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk index 3d9a54e..ce205a9 100644 --- a/utilities/bugtool/automake.mk +++ b/utilities/bugtool/automake.mk @@ -54,9 +54,12 @@ bugtool-uninstall-local: rm -f "$(DESTDIR)$(bugtoolpluginsdir)/$$stem"; \ done for plugin in $(bugtool_plugins); do \ - stem=`echo "$$plugin" | sed 's,utilities/bugtool/plugins/,,'`; \ + stem=`echo "$$plugin" | sed 's,ovn/,,'`; \ + stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \ dir=`expr "$$stem" : '\(.*\)/[^/]*$$'`; \ - rmdir "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \ + if [ ! -z "$$dir" ]; then \ + rm -rf "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \ + fi \ done; exit 0 endif