From e4e980ee979b386cdd7fba835a34d0d964f73fe8 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 27 Nov 2018 17:22:14 -0800 Subject: [PATCH] bcl2fastq2 package: recursively delete after copy (#9959) Fixes #9944 73c978d replaced a move with a copy, which cased rmdir to fail (as it expects an empty directory). This switches to use `shutil.rmtree` instead. --- var/spack/repos/builtin/packages/bcl2fastq2/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index f3eb3175ac7..1b07e50d548 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -5,6 +5,7 @@ from spack import * import os +import shutil import glob import llnl.util.tty as tty @@ -71,11 +72,10 @@ def wrap(): tty.msg("The tarball has already been unpacked") else: tty.msg("Unpacking bcl2fastq2 tarball") - tty.msg("cwd sez: {0}".format(os.getcwd())) tarball = glob.glob(join_path('spack-expanded-archive', 'bcl2fastq2*.tar.gz'))[0] copy(tarball, '.') - os.rmdir('spack-expanded-archive') + shutil.rmtree('spack-expanded-archive') tar = which('tar') tarball = os.path.basename(tarball) tar('-xf', tarball)