From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [elpa] master 872014e: Prevent accidental deletion of .git Date: Wed, 18 Nov 2015 10:10:26 -0500 Message-ID: References: <20151109013124.17711.29422@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447859458 23988 80.91.229.3 (18 Nov 2015 15:10:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 15:10:58 +0000 (UTC) Cc: "=?windows-1252?Q?Fabi=E1n?= E. Gallina" , emacs-devel@gnu.org To: Thomas Fitzsimmons Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 18 16:10:50 2015 Return-path: Envelope-to: ged-emacs-devel@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 1Zz4Nk-0003B3-Bo for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 16:10:49 +0100 Original-Received: from localhost ([::1]:36436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz4Nj-00080C-Ky for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 10:10:47 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz4NX-0007xi-V9 for emacs-devel@gnu.org; Wed, 18 Nov 2015 10:10:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz4NW-0000oC-Ib for emacs-devel@gnu.org; Wed, 18 Nov 2015 10:10:35 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:50399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz4NR-0000nk-If; Wed, 18 Nov 2015 10:10:29 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id tAIFAQw4023241; Wed, 18 Nov 2015 10:10:27 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 5888AAE25F; Wed, 18 Nov 2015 10:10:26 -0500 (EST) In-Reply-To: (Thomas Fitzsimmons's message of "Wed, 18 Nov 2015 09:39:06 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5494=0 X-NAI-Spam-Version: 2.3.0.9418 : core <5494> : inlines <4009> : streams <1540160> : uri <2085211> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:194713 Archived-At: > How about the attached? Looks like a good start, thank you. > @@ -207,8 +207,11 @@ (defun archive--process-simple-package (dir pkg vers desc req extras) > "Deploy the contents of DIR into the archive as a simple package. > Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return the descriptor." > ;; Write DIR/foo.el to foo-VERS.el and delete DIR > - (rename-file (expand-file-name (concat pkg ".el") dir) > - (concat pkg "-" vers ".el")) > + (if (file-symlink-p (expand-file-name (concat pkg ".el") dir)) > + (copy-file (expand-file-name (concat pkg ".el") dir) > + (concat pkg "-" vers ".el")) > + (rename-file (expand-file-name (concat pkg ".el") dir) > + (concat pkg "-" vers ".el"))) I'd use (let ((src (expand-file-name (concat pkg ".el") dir))) (funcall (if (file-symlink-p src) #'copy-file #'rename-file) src (concat pkg "-" vers ".el"))) to avoid redundancy. > (defun archive--core-package-copy-file > (source dest emacs-repo-root package-root exclude-regexp) > - "Copy file from SOURCE to DEST ensuring subdirectories." > + "Link file from SOURCE to DEST ensuring subdirectories." The function name would need to be correspondingly adjusted ;-) > - (copy-file absolute-core-file-name absolute-package-file-name)) > + (if (memq system-type '(windows-nt ms-dos)) > + (copy-file absolute-core-file-name absolute-package-file-name) > + (make-symbolic-link absolute-core-file-name + > absolute-package-file-name t))) I don't have a Windows system to test it, but if possible I'd rather have something like (if (fboundp 'make-symbolic-link) ...) or (condition-case nil (make-symbolic-link absolute-core-file-name absolute-package-file-name t) ( (copy-file absolute-core-file-name absolute-package-file-name))) We'd also want to try and fix the directory-deletion code accordingly, so it's less trigger happy. Stefan "who also got caught by this directory deletion code"