From: Boris Ranto <branto@redhat.com>
Date: Thu, 18 May 2017 14:58:26 +0000 (+0200)
Subject: samba: Fix the xargs command
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=254cb2b047d5b8fcc780e69306f28809b3718110;p=ceph-build.git

samba: Fix the xargs command

The xargs command only serialized the input. Using the plain on lines to
be sure this time.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/samba/build/build_deb b/samba/build/build_deb
index 2221c7d3..2db1fc10 100644
--- a/samba/build/build_deb
+++ b/samba/build/build_deb
@@ -35,13 +35,11 @@ sudo cp $WORKSPACE/shaman.list /etc/apt/sources.list.d/
 
 ## Install any setup-time deps
 # Make sure we use the latest ceph versions, remove any old bits
-xargs sudo apt-get remove -y <<< "
-libcephfs-dev
-libcephfs1
-libcephfs2
-librados2
-librbd1
-"
+sudo apt-get remove -y libcephfs-dev || true
+sudo apt-get remove -y libcephfs2 || true
+sudo apt-get remove -y libcephfs1 || true
+sudo apt-get remove -y librados2 || true
+sudo apt-get remove -y librbd1 || true
 
 # We need these for the build
 sudo apt-get update && sudo apt-get install -y build-essential equivs libgnutls-dev libacl1-dev libldap2-dev ruby ruby-dev libcephfs-dev