diff lisp/package-get.el @ 363:972bbb6d6ca2 r21-1-11

Import from CVS: tag r21-1-11
author cvs
date Mon, 13 Aug 2007 10:59:28 +0200
parents 8e84bee8ddd0
children 1d62742628b6
line wrap: on
line diff
--- a/lisp/package-get.el	Mon Aug 13 10:58:41 2007 +0200
+++ b/lisp/package-get.el	Mon Aug 13 10:59:28 2007 +0200
@@ -373,7 +373,8 @@
 	  (setq location (expand-file-name package-get-base-filename
 		(expand-file-name "etc/" package-get-user-package-location))))
 	(when (y-or-n-p (concat "Update package index in " location "? "))
-	  (write-file location))))))
+	  (let ((coding-system-for-write 'binary))
+	    (write-file location)))))))
       
 
 ;;;###autoload
@@ -399,7 +400,7 @@
         (save-excursion
           (set-buffer buf)
           (erase-buffer buf)
-          (insert-file-contents-internal db-file)
+          (insert-file-contents-literally db-file)
           (package-get-update-base-from-buffer buf)
 	  (if (file-remote-p db-file)
 	      (package-get-maybe-save-index db-file)))
@@ -846,14 +847,11 @@
       ;; Doing it with XEmacs removes the need for an external md5 program
       (message "Validating checksum for `%s'..." package) (sit-for 0)
       (with-temp-buffer
-	;; What ever happened to i-f-c-literally
-	(let (file-name-handler-alist)
-	  (insert-file-contents-internal full-package-filename))
-	(if (not (string= (md5 (current-buffer))
-			  (package-get-info-prop this-package
-						 'md5sum)))
-	    (error "Package %s does not match md5 checksum" base-filename)))
-
+		(insert-file-contents-literally full-package-filename)
+		(if (not (string= (md5 (current-buffer))
+						  (package-get-info-prop this-package
+												 'md5sum)))
+			(error "Package %s does not match md5 checksum" base-filename)))
       (package-admin-delete-binary-package package install-dir)
 
       (message "Installing package `%s' ..." package) (sit-for 0)