Permalink
Browse files

Add :default profile in when loading plugins outside a project.

  • Loading branch information...
1 parent 0a4d1c1 commit 377904f6b8ab4bd61cebba1da53aeabe6243dc4e @technomancy committed Mar 8, 2012
Showing with 8 additions and 8 deletions.
  1. +1 −1 leiningen-core/src/leiningen/core/main.clj
  2. +5 −6 src/leiningen/jar.clj
  3. +2 −1 todo.org
@@ -116,7 +116,7 @@ or by executing \"lein upgrade\". ")
(when (:min-lein-version project)
(verify-min-version project))
(when-not project
- (project/load-plugins (:user (user/profiles))))
+ (project/load-plugins (project/merge-profiles {} [:user :default])))
(doseq [[task-name & args] (group-args args)
:let [task-name (or (@aliases task-name)
(get (:aliases project) task-name)
View
@@ -136,12 +136,11 @@
(conj acc (:path spec)))
(defn write-jar [project out-file filespecs]
- (let [manifest (make-manifest project)]
- (with-open [jar-os (-> out-file
- (FileOutputStream.)
- (BufferedOutputStream.)
- (JarOutputStream. manifest))]
- (reduce (partial copy-to-jar project jar-os) #{} filespecs))))
+ (with-open [jar-os (-> out-file
+ (FileOutputStream.)
+ (BufferedOutputStream.)
+ (JarOutputStream. (make-manifest project)))]
+ (reduce (partial copy-to-jar project jar-os) #{} filespecs)))
(defn- filespecs [project deps-fileset]
(concat [{:type :bytes
View
@@ -29,10 +29,11 @@ See also https://github.com/technomancy/leiningen/issues
- [X] Update new task
- [X] Switch user-settings to checking :user profile sans project
- [X] Offline mode
+** Other stuff (post-preview)
+ - [ ] Force checking of snapshots
- [ ] Document subcommands in newnew
- [ ] Pretty-print pom
- [ ] Look for :java-cmd in project map
-** Other stuff (post-preview)
- [ ] deps :tree and deps :list
- [ ] Honor hooks declared in plugin jar metadata?
- [ ] Show aliases in lein help

0 comments on commit 377904f

Please sign in to comment.