[Emacs-diffs] /srv/bzr/emacs/trunk r103591: * simple.el (shell-command-to-string): Use `process-file'.

[Michael Albinus]

------------------------------------------------------------
revno: 103591
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-08 13:58:40 +0100
message:
  * simple.el (shell-command-to-string): Use `process-file'.
  
  * emacs-lisp/package.el (package-tar-file-info): Handle also
  remote files.
  
  * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
  `equal' for upload base check.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package-x.el
  lisp/emacs-lisp/package.el
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-08 04:42:40 +0000
+++ b/lisp/ChangeLog    2011-03-08 12:58:40 +0000
@@ -1,3 +1,13 @@
+2011-03-08  Michael Albinus  <address@hidden>
+
+       * simple.el (shell-command-to-string): Use `process-file'.
+
+       * emacs-lisp/package.el (package-tar-file-info): Handle also
+       remote files.
+
+       * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
+       `equal' for upload base check.
+
 2011-03-08  Arni Magnusson  <address@hidden>  (tiny change)
 
        * textmodes/texinfo.el (texinfo-environments):

=== modified file 'lisp/emacs-lisp/package-x.el'
--- a/lisp/emacs-lisp/package-x.el      2011-03-06 20:19:39 +0000
+++ b/lisp/emacs-lisp/package-x.el      2011-03-08 12:58:40 +0000
@@ -185,9 +185,9 @@
   (let ((package-archive-upload-base package-archive-upload-base))
     ;; Check if `package-archive-upload-base' is valid.
     (when (or (not (stringp package-archive-upload-base))
-             (eq package-archive-upload-base
-                 (car-safe
-                  (get 'package-archive-upload-base 'standard-value))))
+             (equal package-archive-upload-base
+                    (car-safe
+                     (get 'package-archive-upload-base 'standard-value))))
       (setq package-archive-upload-base
            (read-directory-name
             "Base directory for package archive: ")))
@@ -306,4 +306,4 @@
 
 (provide 'package-x)
 
-;;; package.el ends here
+;;; package-x.el ends here

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2011-03-06 03:22:06 +0000
+++ b/lisp/emacs-lisp/package.el        2011-03-08 12:58:40 +0000
@@ -911,43 +911,46 @@
   "Find package information for a tar file.
 FILE is the name of the tar file to examine.
 The return result is a vector like `package-buffer-info'."
-  (unless (string-match "^\\(.+\\)-\\([0-9.]+\\)\\.tar$" file)
-    (error "Invalid package name `%s'" file))
-  (let* ((pkg-name (file-name-nondirectory (match-string-no-properties 1 
file)))
-        (pkg-version (match-string-no-properties 2 file))
-        ;; Extract the package descriptor.
-        (pkg-def-contents (shell-command-to-string
-                           ;; Requires GNU tar.
-                           (concat "tar -xOf " file " "
-                                   pkg-name "-" pkg-version "/"
-                                   pkg-name "-pkg.el")))
-        (pkg-def-parsed (package-read-from-string pkg-def-contents)))
-    (unless (eq (car pkg-def-parsed) 'define-package)
-      (error "No `define-package' sexp is present in `%s-pkg.el'" pkg-name))
-    (let ((name-str       (nth 1 pkg-def-parsed))
-         (version-string (nth 2 pkg-def-parsed))
-         (docstring      (nth 3 pkg-def-parsed))
-         (requires       (nth 4 pkg-def-parsed))
-         (readme (shell-command-to-string
-                  ;; Requires GNU tar.
-                  (concat "tar -xOf " file " "
-                          pkg-name "-" pkg-version "/README"))))
-      (unless (equal pkg-version version-string)
-       (error "Package has inconsistent versions"))
-      (unless (equal pkg-name name-str)
-       (error "Package has inconsistent names"))
-      ;; Kind of a hack.
-      (if (string-match ": Not found in archive" readme)
-         (setq readme nil))
-      ;; Turn string version numbers into list form.
-      (if (eq (car requires) 'quote)
-         (setq requires (car (cdr requires))))
-      (setq requires
-           (mapcar (lambda (elt)
-                     (list (car elt)
-                           (version-to-list (cadr elt))))
-                   requires))
-      (vector pkg-name requires docstring version-string readme))))
+  (let ((default-directory (file-name-directory file))
+       (file (file-name-nondirectory file)))
+    (unless (string-match "^\\(.+\\)-\\([0-9.]+\\)\\.tar$" file)
+      (error "Invalid package name `%s'" file))
+    (let* ((pkg-name (match-string-no-properties 1 file))
+          (pkg-version (match-string-no-properties 2 file))
+          ;; Extract the package descriptor.
+          (pkg-def-contents (shell-command-to-string
+                             ;; Requires GNU tar.
+                             (concat "tar -xOf " file " "
+
+                                     pkg-name "-" pkg-version "/"
+                                     pkg-name "-pkg.el")))
+          (pkg-def-parsed (package-read-from-string pkg-def-contents)))
+      (unless (eq (car pkg-def-parsed) 'define-package)
+       (error "No `define-package' sexp is present in `%s-pkg.el'" pkg-name))
+      (let ((name-str       (nth 1 pkg-def-parsed))
+           (version-string (nth 2 pkg-def-parsed))
+           (docstring      (nth 3 pkg-def-parsed))
+           (requires       (nth 4 pkg-def-parsed))
+           (readme (shell-command-to-string
+                    ;; Requires GNU tar.
+                    (concat "tar -xOf " file " "
+                            pkg-name "-" pkg-version "/README"))))
+       (unless (equal pkg-version version-string)
+         (error "Package has inconsistent versions"))
+       (unless (equal pkg-name name-str)
+         (error "Package has inconsistent names"))
+       ;; Kind of a hack.
+       (if (string-match ": Not found in archive" readme)
+           (setq readme nil))
+       ;; Turn string version numbers into list form.
+       (if (eq (car requires) 'quote)
+           (setq requires (car (cdr requires))))
+       (setq requires
+             (mapcar (lambda (elt)
+                       (list (car elt)
+                             (version-to-list (cadr elt))))
+                     requires))
+       (vector pkg-name requires docstring version-string readme)))))
 
 ;;;###autoload
 (defun package-install-from-buffer (pkg-info type)

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-02-19 19:40:59 +0000
+++ b/lisp/simple.el    2011-03-08 12:58:40 +0000
@@ -2628,7 +2628,7 @@
   (with-output-to-string
     (with-current-buffer
       standard-output
-      (call-process shell-file-name nil t nil shell-command-switch command))))
+      (process-file shell-file-name nil t nil shell-command-switch command))))
 
 (defun process-file (program &optional infile buffer display &rest args)
   "Process files synchronously in a separate process.