Skip to content

Commit 4bb0905

Browse files
committed
no package-install if source is available locally
This commit updates all places where packages are automatically installed using ELPA to first check if the package is available from a local source directory (i.e., under the src/ directory). This makes it possible for users to override the ELPA versions of packages with local versions from source. E.g., with this change I'm able to run my own fork of magit and starter-kit-misc.org will not install magit from ELPA.
1 parent ed58615 commit 4bb0905

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

starter-kit-misc.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Determine whether required packages are installed. If not, use ELPA to
1212
install them. Other dependencies are provided by Emacs 24.
1313
#+begin_src emacs-lisp
1414
(dolist (package '(magit))
15-
(unless (package-installed-p package)
15+
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
1616
(package-install package)))
1717
#+end_src
1818

starter-kit-python.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Determine whether required packages are installed. If not, use ELPA to
1313
install them.
1414
#+begin_src emacs-lisp
1515
(dolist (package '(python-mode ipython))
16-
(unless (package-installed-p package)
16+
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
1717
(package-install package)))
1818
#+end_src
1919

starter-kit-ruby.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Support for the [[http://www.ruby-lang.org/en/][Ruby]] dynamic, open-source prog
2525
** Yaml mode
2626
#+begin_src emacs-lisp
2727
(dolist (package '(yaml-mode))
28-
(unless (package-installed-p package)
28+
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
2929
(package-install package)))
3030
(require 'yaml-mode)
3131
(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))

starter-kit.org

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ interested in the actual code implementing the starter kit.
305305
(unless package-archive-contents
306306
(package-refresh-contents))
307307
(dolist (package starter-kit-packages)
308-
(unless (package-installed-p package)
308+
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
309309
(package-install package)))
310310
#+end_src
311311

0 commit comments

Comments
 (0)