diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py
index ec3b221988aaef5cabf5f72626beca3802b9248a..c20136ebe5da34c2861de83db9d9e520812e28ee 100644
--- a/lib/spack/spack/cmd/clean.py
+++ b/lib/spack/spack/cmd/clean.py
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2013-2014, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
#
# This file is part of Spack.
@@ -23,45 +23,24 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from external import argparse
-import subprocess
import llnl.util.tty as tty
import spack
import spack.cmd
-import spack.stage as stage
-description = "Remove staged files for packages"
+description = "Remove build stage and source tarball for packages."
def setup_parser(subparser):
- subparser.add_argument('-c', "--clean", action="store_true", dest='clean',
- help="run make clean in the build directory (default)")
- subparser.add_argument('-w', "--work", action="store_true", dest='work',
- help="delete the build directory and re-expand it from its archive.")
- subparser.add_argument('-d', "--dist", action="store_true", dest='dist',
- help="delete the downloaded archive.")
subparser.add_argument('packages', nargs=argparse.REMAINDER,
help="specs of packages to clean")
def clean(parser, args):
if not args.packages:
- tty.die("spack clean requires at least one package argument")
+ tty.die("spack clean requires at least one package spec.")
specs = spack.cmd.parse_specs(args.packages, concretize=True)
for spec in specs:
package = spack.db.get(spec)
- if args.dist:
- package.do_clean_dist()
- tty.msg("Cleaned %s" % package.name)
-
- elif args.work:
- package.do_clean_work()
- tty.msg("Restaged %s" % package.name)
-
- else:
- try:
- package.do_clean()
- except subprocess.CalledProcessError, e:
- tty.warn("Warning: 'make clean' didn't work. Consider 'spack clean --work'.")
- tty.msg("Made clean for %s" % package.name)
+ package.do_clean()
diff --git a/lib/spack/spack/cmd/restage.py b/lib/spack/spack/cmd/restage.py
new file mode 100644
index 0000000000000000000000000000000000000000..e735a12c327335954401951d4b28d419a171e1ea
--- /dev/null
+++ b/lib/spack/spack/cmd/restage.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2014, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://scalability-llnl.github.io/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from external import argparse
+
+import llnl.util.tty as tty
+
+import spack
+import spack.cmd
+
+description = "Revert checked out package source code."
+
+def setup_parser(subparser):
+ subparser.add_argument('packages', nargs=argparse.REMAINDER,
+ help="specs of packages to restage")
+
+
+def restage(parser, args):
+ if not args.packages:
+ tty.die("spack restage requires at least one package spec.")
+
+ specs = spack.cmd.parse_specs(args.packages, concretize=True)
+ for spec in specs:
+ package = spack.db.get(spec)
+ package.do_restage()
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index bc8541a184f035b7d32dd05ae9f0fbc2d14d109b..492af12053e72b4ac4a0c4dbd644658c392563e0 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -1047,26 +1047,13 @@ def ignore(filename):
tree.unmerge(self.prefix, ignore=ignore)
- def do_clean(self):
- if self.stage.expanded_archive_path:
- self.stage.chdir_to_source()
- self.clean()
-
-
- def clean(self):
- """By default just runs make clean. Override if this isn't good."""
- # TODO: should we really call make clean, ro just blow away the directory?
- make = build_env.MakeExecutable('make', self.parallel)
- make('clean')
-
-
- def do_clean_work(self):
- """By default just blows away the stage directory and re-stages."""
+ def do_restage(self):
+ """Reverts expanded/checked out source to a pristine state."""
self.stage.restage()
- def do_clean_dist(self):
- """Removes the stage directory where this package was built."""
+ def do_clean(self):
+ """Removes the package's build stage and source tarball."""
if os.path.exists(self.stage.path):
self.stage.destroy()
diff --git a/var/spack/packages/libdwarf/package.py b/var/spack/packages/libdwarf/package.py
index c4d71ebc01077769135346fc579252aeb31475e0..099a974e934fde4fccaeeeeb8c3556e40bb57904 100644
--- a/var/spack/packages/libdwarf/package.py
+++ b/var/spack/packages/libdwarf/package.py
@@ -53,13 +53,6 @@ class Libdwarf(Package):
parallel = False
- def clean(self):
- for dir in dwarf_dirs:
- with working_dir(dir):
- if os.path.exists('Makefile'):
- make('clean')
-
-
def install(self, spec, prefix):
# dwarf build does not set arguments for ar properly
make.add_default_arg('ARFLAGS=rcs')
diff --git a/var/spack/packages/py-virtualenv/package.py b/var/spack/packages/py-virtualenv/package.py
index 9d94c2dcda088b711b930ff17274fd6720a98af7..2d10d440a6c679b492168ccdce778166fd33a2fb 100644
--- a/var/spack/packages/py-virtualenv/package.py
+++ b/var/spack/packages/py-virtualenv/package.py
@@ -11,9 +11,5 @@ class PyVirtualenv(Package):
extends('python')
depends_on('py-setuptools')
- def clean(self):
- if os.path.exists('build'):
- shutil.rmtree('build')
-
def install(self, spec, prefix):
python('setup.py', 'install', '--prefix=%s' % prefix)