[ovs-git] [openvswitch/ovs] 2b220d: ovs-bugtool: Correct "rmdir" error messages during...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 2b220d1768e80accaca0ff829a0fd53108b34444
      https://github.com/openvswitch/ovs/commit/2b220d1768e80accaca0ff829a0fd53108b34444
  Author: mweglicx <michalx.weglicki at intel.com>
  Date:   2016-08-12 (Fri, 12 Aug 2016)

  Changed paths:
    M utilities/bugtool/automake.mk

  Log Message:
  -----------
  ovs-bugtool: Correct "rmdir" error messages during "make distcheck".

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

The problem is that during clean up procedure of distcheck:

rmdir: failed to remove ‘/openvswitch-2.5.90/_inst/share/openvswitch/bugtool-plugins/’: Directory not empty
rmdir: failed to remove ‘/openvswitch-2.5.90/_inst/share/openvswitch/bugtool-plugins/ovn/network-status ’: No such file or directory

The first entry is caused by xml file which is kept flat in the directory
structure (not in the subdirectory as it is for other plugins), and rmdir
"tries" to remove folder which keeps all plugins files and folders. That is
why additional check if directory is not empty is added, to prevent that.

The second entry is cause by some other commit when ovs plugin has been added:
stem=`echo "$$plugin" | sed 's,ovn/,,'`; \

So in that sense directory path has been modified during removal of xml
file, but it hasn't been updated during directory removal.

I didn't want to really change this logic, as I'm not sure if there
something else can be stored in this directory, but it was very tempting to
remove everything just by:

rm -rf "$(DESTDIR)$(bugtoolpluginsdir)/*"

Signed-off-by: Michal Weglicki <michalx.weglicki at intel.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>