X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fpackage-get.el;h=acc3483ed5234702043c49252b3c768d5bb9b4ad;hp=539c6be5f83ed54588a37341e09693733f8645ad;hb=35adcaaeafb1fe93eaf00c39b48619e8f188ff3f;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921 diff --git a/lisp/package-get.el b/lisp/package-get.el index 539c6be..acc3483 100644 --- a/lisp/package-get.el +++ b/lisp/package-get.el @@ -260,7 +260,10 @@ When nil, updates which are not PGP signed are allowed without confirmation." (mapcar (lambda (site) (vector (car site) `(push (quote ,(cdr site)) - package-get-remote))) + package-get-remote) + :style 'toggle + :selected `(member (quote ,(cdr site)) + package-get-remote))) package-get-download-sites)) ;;;###autoload @@ -702,8 +705,10 @@ successfully installed but errors occurred during initialization, or (package-status t) filenames full-package-filename) (if (null this-package) - (error "Couldn't find package %s with version %s" - package version)) + (if package-get-remote + (error "Couldn't find package %s with version %s" + package version) + (error "No download sites or local package locations specified."))) (if (null base-filename) (error "No filename associated with package %s, version %s" package version)) @@ -804,7 +809,10 @@ successfully installed but errors occurred during initialization, or (if (or (not full-package-filename) (not (file-exists-p full-package-filename))) - (error "Unable to find file %s" base-filename)) + (if package-get-remote + (error "Unable to find file %s" base-filename) + (error + "No download sites or local package locations specified."))) ;; Validate the md5 checksum ;; Doing it with XEmacs removes the need for an external md5 program (message "Validating checksum for `%s'..." package) (sit-for 0) @@ -937,7 +945,9 @@ words (if (efs-ftp-path filename) filename (let ((dir (cadr search))) - (concat "/" + (concat (if (string-match "@" (car search)) + "/" + "/anonymous@") (car search) ":" (if (string-match "/$" dir) dir