Commit ff49ec5c authored by Eric Timmons's avatar Eric Timmons
Browse files

Try harder to make sure :STRIP-COMPONENTS is never NIL when extracting a tarball

parent e0742616
......@@ -117,14 +117,14 @@ methods (this does *not* look at ~archive-stream~ to guess what the correct
archive type is)"))
(defmethod unarchive ((archive-type symbol) archive-stream destination-pathname
&key strip-components)
&key (strip-components 0))
"If ~archive-type~ is a symbol, instantiate the class it names and call
again."
(unarchive (make-instance archive-type) archive-stream destination-pathname
:strip-components strip-components))
(defmethod unarchive ((archive-type tar-archive) archive-stream destination-pathname
&key strip-components)
&key (strip-components 0))
"If ~archive-type~ is a ~tar-archive~, dispatch to ~unarchive-tar~ using the
preferred tar client."
(unarchive-tar (get-preferred-tar-client) archive-stream destination-pathname
......
......@@ -482,7 +482,7 @@ include it."
(multiple-value-bind (stream archive-type)
(repo-archive-stream repo `(:commit ,(vcs-release-commit release)))
(with-open-stream (stream stream)
(unarchive archive-type stream install-root))))))
(unarchive archive-type stream install-root :strip-components 0))))))
(setf (vcs-release-installed-p release) t)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment