From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bogolisk Newsgroups: gmane.emacs.bugs Subject: bug#23050: package.el overwrites symlinks when saving Date: Tue, 22 Mar 2016 16:51:50 +0000 (UTC) Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458685043 10897 80.91.229.3 (22 Mar 2016 22:17:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 22:17:23 +0000 (UTC) To: 23050@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 22 23:17:12 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiUbu-0008NJ-KM for geb-bug-gnu-emacs@m.gmane.org; Tue, 22 Mar 2016 23:17:10 +0100 Original-Received: from localhost ([::1]:39895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiUbt-00033H-Gh for geb-bug-gnu-emacs@m.gmane.org; Tue, 22 Mar 2016 18:17:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiUbp-00032z-6P for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 18:17:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiUbl-0000z7-U5 for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 18:17:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiUbl-0000z2-Qk for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 18:17:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1aiUbl-0005iy-Mc for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 18:17:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Bogolisk Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Mar 2016 22:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.145868500621971 (code B ref -1); Tue, 22 Mar 2016 22:17:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Mar 2016 22:16:46 +0000 Original-Received: from localhost ([127.0.0.1]:60517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aiUbV-0005iI-LO for submit@debbugs.gnu.org; Tue, 22 Mar 2016 18:16:46 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aiPaT-0002tt-SG for submit@debbugs.gnu.org; Tue, 22 Mar 2016 12:55:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPaN-0003GT-Kp for submit@debbugs.gnu.org; Tue, 22 Mar 2016 12:55:16 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:60715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPaN-0003GO-II for submit@debbugs.gnu.org; Tue, 22 Mar 2016 12:55:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPaM-0003j6-GM for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 12:55:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPaH-0003Em-GL for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 12:55:14 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:38249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPaH-0003E1-9b for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 12:55:09 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1aiPaB-0001tN-Uj for bug-gnu-emacs@gnu.org; Tue, 22 Mar 2016 17:55:03 +0100 Original-Received: from lmcfwa.ericsson.ca ([192.75.88.130]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 17:55:03 +0100 Original-Received: from bogolisk by lmcfwa.ericsson.ca with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 17:55:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 87 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: sea.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 192.75.88.130 (Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.85 Safari/537.36) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Tue, 22 Mar 2016 18:16:44 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:115369 Archived-At: Glenn Morris gnu.org> writes: > > Glenn Morris wrote: > > > I see the relevant code binds file-precious-flag, so this is > > http://debbugs.gnu.org/18125 . > > PS So package.el could avoid the issue by binding > find-file-visit-truename, like cus-edit does (see bug#454). > > The fix is for basic-save-buffer-2() to use buffer-file-truename when save- by-rename. --- files.old.el 2016-03-22 12:43:37.124790562 -0400 +++ files.new.el 2016-03-22 12:44:32.361602364 -0400 @@ -4840,29 +4840,29 @@ ;; backup-buffer. (defun basic-save-buffer-2 () (let (tempsetmodes setmodes) - (if (not (file-writable-p buffer-file-name)) - (let ((dir (file-name-directory buffer-file-name))) + (if (not (file-writable-p buffer-file-truename)) + (let ((dir (file-name-directory buffer-file-truename))) (if (not (file-directory-p dir)) (if (file-exists-p dir) (error "%s is not a directory" dir) (error "%s: no such directory" dir)) - (if (not (file-exists-p buffer-file-name)) + (if (not (file-exists-p buffer-file-truename)) (error "Directory %s write-protected" dir) (if (yes-or-no-p (format "File %s is write-protected; try to save anyway? " (file-name-nondirectory - buffer-file-name))) + buffer-file-truename))) (setq tempsetmodes t) (error "Attempt to save to a file which you aren't allowed to write")))))) (or buffer-backed-up (setq setmodes (backup-buffer))) - (let* ((dir (file-name-directory buffer-file-name)) + (let* ((dir (file-name-directory buffer-file-truename)) (dir-writable (file-writable-p dir))) (if (or (and file-precious-flag dir-writable) (and break-hardlink-on-save - (file-exists-p buffer-file-name) - (> (file-nlinks buffer-file-name) 1) + (file-exists-p buffer-file-truename) + (> (file-nlinks buffer-file-truename) 1) (or dir-writable (error (concat "Directory %s write-protected; " "cannot break hardlink when saving") @@ -4870,7 +4870,7 @@ ;; Write temp name, then rename it. ;; This requires write access to the containing dir, ;; which is why we don't try it if we don't have that access. - (let ((realname buffer-file-name) + (let ((realname buffer-file-truename) tempname succeed (umask (default-file-modes)) (old-modtime (visited-file-modtime))) @@ -4911,13 +4911,13 @@ ;; Since we have created an entirely new file, ;; make sure it gets the right permission bits set. (setq setmodes (or setmodes - (list (or (file-modes buffer-file-name) + (list (or (file-modes buffer-file-truename) (logand ?\666 umask)) - (file-extended-attributes buffer-file- name) - buffer-file-name))) + (file-extended-attributes buffer-file- truename) + buffer-file-truename))) ;; We succeeded in writing the temp file, ;; so rename it. - (rename-file tempname buffer-file-name t)) + (rename-file tempname buffer-file-truename t)) ;; If file not writable, see if we can make it writable ;; temporarily while we write it. ;; But no need to do so if we have just backed it up