[ovs-dev] [PATCH] ovs-bugtool: Correct "rmdir" error messages during "make distcheck".

mweglicx michalx.weglicki at intel.com
Fri Jul 29 10:01:08 UTC 2016


Remove duplicated delete attempts and error messages during distcheck
clean procedure.

Signed-off-by: Michal Weglicki <michalx.weglicki at intel.com>
---
 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
 
-- 
1.9.3




More information about the dev mailing list