diff options
author | Andreas Baumbach <healther@users.noreply.github.com> | 2018-07-15 02:20:49 +0200 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-07-14 17:20:49 -0700 |
commit | 79b407f59e7a9ef73d95d087c0e2bba31952c643 (patch) | |
tree | 5a9201d91ffc9f5856fd7be7756b3404d8a25f76 /lib | |
parent | 5192a3d6d6566c7edde246020ca7ebd48697d957 (diff) | |
download | spack-79b407f59e7a9ef73d95d087c0e2bba31952c643.tar.gz spack-79b407f59e7a9ef73d95d087c0e2bba31952c643.tar.bz2 spack-79b407f59e7a9ef73d95d087c0e2bba31952c643.tar.xz spack-79b407f59e7a9ef73d95d087c0e2bba31952c643.zip |
clean up of spack clean (#8610)
* update help of `clean --all` to include `-p`
* remove old orphaned `.pyc` removal
* restrict removal or orphaned pyc files to `lib/spack` and `var/spack`
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/cmd/clean.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index b61a02adb0..185a2c406a 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -32,7 +32,8 @@ import spack.caches import spack.cmd import spack.repo import spack.stage -from spack.paths import spack_root +from spack.paths import lib_path, var_path + description = "remove temporary build files and/or downloaded archives" section = "build" @@ -59,7 +60,7 @@ def setup_parser(subparser): '-p', '--python-cache', action='store_true', help="remove .pyc, .pyo files and __pycache__ folders") subparser.add_argument( - '-a', '--all', action=AllClean, help="equivalent to -sdm", nargs=0 + '-a', '--all', action=AllClean, help="equivalent to -sdmp", nargs=0 ) subparser.add_argument( 'specs', @@ -97,14 +98,15 @@ def clean(parser, args): if args.python_cache: tty.msg('Removing python cache files') - for root, dirs, files in os.walk(spack_root): - for f in files: - if f.endswith('.pyc') or f.endswith('.pyo'): - fname = os.path.join(root, f) - tty.debug('Removing {0}'.format(fname)) - os.remove(fname) - for d in dirs: - if d == '__pycache__': - dname = os.path.join(root, d) - tty.debug('Removing {0}'.format(dname)) - shutil.rmtree(dname) + for directory in [lib_path, var_path]: + for root, dirs, files in os.walk(directory): + for f in files: + if f.endswith('.pyc') or f.endswith('.pyo'): + fname = os.path.join(root, f) + tty.debug('Removing {0}'.format(fname)) + os.remove(fname) + for d in dirs: + if d == '__pycache__': + dname = os.path.join(root, d) + tty.debug('Removing {0}'.format(dname)) + shutil.rmtree(dname) |