From 1d2660af22ff1f945a8858bab55a5956b12a036e Mon Sep 17 00:00:00 2001 From: Matthaus Owens Date: Tue, 18 Dec 2012 11:57:04 -0800 Subject: [PATCH] (maint) Remove xargs rm on empty file list from puppet.spec.erb There are no empty files in examples, so the `xargs rm` call on that directory fail. This commit removes that line and adds a --no-run-if-empty to the other xargs call in that section. This commit also moves conf/puppet-queue.conf to an existing examples directory instead of examples/etc/puppet, which no longer exists. --- ext/redhat/puppet.spec.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/redhat/puppet.spec.erb b/ext/redhat/puppet.spec.erb index b25c7724185..18331ee4a5e 100644 --- a/ext/redhat/puppet.spec.erb +++ b/ext/redhat/puppet.spec.erb @@ -101,11 +101,10 @@ for f in external/nagios.rb relationship.rb; do sed -i -e '1d' lib/puppet/$f done -find examples/ -type f -empty | xargs rm -find examples/ -type f | xargs chmod a-x +find examples/ -type f | xargs --no-run-if-empty chmod a-x # puppet-queue.conf is more of an example, used for stompserver -mv conf/puppet-queue.conf examples/etc/puppet/ +mv conf/puppet-queue.conf examples/ %install rm -rf %{buildroot} @@ -380,7 +379,7 @@ rm -rf %{buildroot} - Build for <%= @version %> * Tue Dec 18 2012 Matthaus Owens -- Remove for loop on examples/ code which no longer exists. +- Remove for loop on examples/ code which no longer exists. Add --no-run-if-empty to xargs invocations. * Sat Dec 1 2012 Ryan Uber - Fix for logdir perms regression (#17866)