Commit fad6f9700f99

@@ -5,7 +5,7 @@
 
 ;; add melpa and melpa-stable to package repos
 (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
-(add-to-list 'package-archives '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/"))
+;; (add-to-list 'package-archives '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/"))
 
 ;; If gpg cannot be found, signature checking will fail, so we
 ;; conditionnally enable it according wether gpg is availabel.
@@ -25,7 +25,8 @@ re-downloaded in order to locate PACKAGE."
     (if (or (assoc package package-archive-contents) no-refresh)
 	(package-install package)
       (progn
-	(package-refresh-contents)
+	(when (not package-archive-contents)
+	  (package-refresh-contents))
 	(require-package package min-version t)))))
 
 ;; Fire up package.el

@@ -25,12 +25,9 @@
 ;; Make sure we have a decent and recent org-mode version
 (when (not (package-installed-p 'org))
   do (package-install 'org))
-(when (not (package-installed-p 'org-plus-contrib))
-  do (package-install 'org-plus-contrib))
-;; 
-(when (not (package-installed-p 'org))
-  do (package-install 'org))(package-install 'org)
-;; (package-install 'org-plus-contrib)
+;;(when (not (package-installed-p 'org-plus-contrib))
+;;  do (package-install 'org-plus-contrib))
+
 (require 'org)
 (when (string-match "^[1234567]" (org-version))
   (warn "Org-mode is out of date. We expect org 8 or higher, but instead we have %s" (org-version)))