Merge remote branch 'JulianBirch/master'

technomancy · Jan 29, 2012 · 2f73e7d · 2f73e7d
2 parents b54469d + 7f58cbc
commit 2f73e7d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
@@ -90,7 +90,13 @@
 (defn- profile-key-merge
   "Merge profile values into the project map based on their type."
   [key result latter]
-  (cond (= :dependencies key)
+  (cond (-> result meta :displace)
+        latter
+
+        (-> latter meta :replace)
+        latter
+
+        (= :dependencies key)
         (merge-dependencies result latter)
 
         (= :repositories key)

diff --git a/leiningen-core/test/leiningen/core/test/project.clj b/leiningen-core/test/leiningen/core/test/project.clj
@@ -59,4 +59,14 @@
            (-> {:resources-path ["resources"]
                 :profiles {:blue {:resources-path ["blue-resources"]}}}
                (merge-profiles [:qa :tes :blue])
-               :resources-path)))))
+               :resources-path)))
+    (is (= ["/etc/myapp" "test/hi" "blue-resources"]
+           (-> {:resources-path ^:displace ["resources"]
+                :profiles {:blue {:resources-path ["blue-resources"]}}}
+               (merge-profiles [:qa :tes :blue])
+               :resources-path)))
+    (is (= ["replaced"]
+           (-> {:resources-path ["resources"]
+                :profiles {:blue {:resources-path ^:replace ["replaced"]}}}
+               (merge-profiles [:blue :qa :tes ])
+               :resources-path)))))