package.el support for file: URLs (was: Package.el merged)

[Ted Zlatanov <tzz@lifelogs.com>]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

On Fri, 13 Aug 2010 13:26:39 -0500 Ted Zlatanov <tzz@lifelogs.com> wrote: 

TZ> On Wed, 16 Jun 2010 22:39:18 -0400 Chong Yidong <cyd@stupidchicken.com> wrote: 
CY> Currently package.el is not in loadup.el; I am still unsure whether to
CY> add it, or use autoloads and juggle things so that it's not loaded
CY> unless the user installs a package.

TZ> I think autoloading package.el could create subtle problems later on,
TZ> especially for distros.  Putting it in loadup.el is probably safer.

Also, package.el assumes HTTP URLs so it breaks if you try to set up a
local ELPA repo.  I made it work with these changes to just two
functions.  The change introduces filep and uses it to determine if we
need to do:

        (package-handle-response)
        (re-search-forward "^$" nil 'move)
        (forward-char)

Patch attached, please review as I don't know package.el so well.  It
seems to work for me.

Ted


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: package.fileURLs.patch --]
[-- Type: text/x-diff, Size: 1709 bytes --]

=== modified file 'lisp/emacs-lisp/package.el'
--- lisp/emacs-lisp/package.el	2010-08-09 18:05:56 +0000
+++ lisp/emacs-lisp/package.el	2010-08-14 14:59:14 +0000
@@ -656,13 +656,15 @@
 
 (defun package-download-tar (name version)
   "Download and install a tar package."
-  (let ((tar-buffer (url-retrieve-synchronously
-		     (concat (package-archive-url name)
-			     (symbol-name name) "-" version ".tar"))))
+  (let* ((tar-url (concat (package-archive-url name)
+                          (symbol-name name) "-" version ".tar"))
+         (filep (equal "file" (url-type (url-generic-parse-url tar-url))))
+         (tar-buffer (url-retrieve-synchronously tar-url)))
     (with-current-buffer tar-buffer
-      (package-handle-response)
-      (re-search-forward "^$" nil 'move)
-      (forward-char)
+      (unless filep
+        (package-handle-response)
+        (re-search-forward "^$" nil 'move)
+        (forward-char))
       (package-unpack name version)
       (kill-buffer tar-buffer))))
 
@@ -995,11 +997,13 @@
          (archive-url  (cdr archive))
 	 (dir (expand-file-name "archives" package-user-dir))
 	 (dir (expand-file-name archive-name dir))
+         (filep (equal "file" (url-type (url-generic-parse-url archive-url))))
          (buffer (url-retrieve-synchronously (concat archive-url file))))
     (with-current-buffer buffer
-      (package-handle-response)
-      (re-search-forward "^$" nil 'move)
-      (forward-char)
+      (unless filep
+        (package-handle-response)
+        (re-search-forward "^$" nil 'move)
+        (forward-char))
       (delete-region (point-min) (point))
       (make-directory dir t)
       (setq buffer-file-name (expand-file-name file dir))