From 7611d3dfd2e1f68bf11027756fd5b217d5ae9640 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Thu, 30 Jan 2020 14:39:51 +0100 Subject: [PATCH] Add -r option when removing egg-info files/folders We are hitting this error: + tools/fixup_stuff.sh:fixup_ubuntu:82 : sudo rm -f /usr/lib/python3/dist-packages/httplib2-0.11.3.egg-info rm: cannot remove '/usr/lib/python3/dist-packages/httplib2-0.11.3.egg-info': Is a directory This patch adds the -r option to allow removing folders. Change-Id: Ib7bb8b0a3dcf747bcc06da1a2fb17fa9d8808484 --- tools/fixup_stuff.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index ae555d5861..15b3ab767d 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -79,9 +79,9 @@ function fixup_ubuntu { # manifest of what to remove. However, in most cases, simply # overwriting works. So this hacks around those packages that # have been dragged in by some other system dependency - sudo rm -f /usr/lib/python3/dist-packages/httplib2-*.egg-info - sudo rm -f /usr/lib/python3/dist-packages/pyasn1_modules-*.egg-info - sudo rm -f /usr/lib/python3/dist-packages/PyYAML-*.egg-info + sudo rm -rf /usr/lib/python3/dist-packages/httplib2-*.egg-info + sudo rm -rf /usr/lib/python3/dist-packages/pyasn1_modules-*.egg-info + sudo rm -rf /usr/lib/python3/dist-packages/PyYAML-*.egg-info } # Python Packages