From f17352c70fc19aa139fb2277ed3a3d9ed2878281 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Fri, 26 Mar 2010 10:30:55 -0700 Subject: [PATCH] Handle container-name arg correctly in list-container. --- blobstore/src/main/clojure/org/jclouds/blobstore.clj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj index 93729981f0..c8a353c673 100644 --- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj +++ b/blobstore/src/main/clojure/org/jclouds/blobstore.clj @@ -95,14 +95,15 @@ Options can also be specified for extension modules :recursive true" [blobstore & args] (if (blobstore? blobstore) - (let [options (apply hash-map args) + (let [[container-name & args] args + options (apply hash-map args) list-options (reduce (fn [lco [k v]] ((list-option-map k) lco v) lco) (ListContainerOptions.) options)] - (.list blobstore (first args) list-options)) + (.list blobstore container-name list-options)) (apply list-container *blobstore* blobstore args))) (defn create-container @@ -234,7 +235,7 @@ container, name, string -> etag" download-blob (fn [& args] (if (= (count args) 3) ::short-form - (class (last args))))) + (class (last (butlast args)))))) (defmethod download-blob ::short-form [container-name name target]