From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: [BUG] bug in org-publish and a (wrong) patch Date: Thu, 07 Apr 2011 01:11:00 -0400 Message-ID: <8052.1302153060@alphaville.dokosmarshall.org> Reply-To: nicholas.dokos@hp.com Return-path: Received: from [140.186.70.92] (port=53403 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7hV4-0003NL-8X for emacs-orgmode@gnu.org; Thu, 07 Apr 2011 01:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q7hV3-0004lA-A0 for emacs-orgmode@gnu.org; Thu, 07 Apr 2011 01:11:22 -0400 Received: from vms173011pub.verizon.net ([206.46.173.11]:41752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q7hV3-0004ki-6J for emacs-orgmode@gnu.org; Thu, 07 Apr 2011 01:11:21 -0400 Received: from alphaville.dokosmarshall.org ([unknown] [173.76.32.106]) by vms173011.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LJ900B1ANQDLUE0@vms173011.mailsrvcs.net> for emacs-orgmode@gnu.org; Thu, 07 Apr 2011 00:11:06 -0500 (CDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: nicholas.dokos@hp.com org-publish-cache-ctime-of-src tries (but does not always succeed) to deal with symlinks: file-symlink-p returns the target as a string, but if the target is relative to the symlink, that's not going to fly. e.g. if c is a symlink like this /a/b/c->../d/f then (file-symlink-p "/a/b/c") -> "../d/f" but if the current directory is any place other than /a/b, the target will not be found, the file attributes are going to be nil and the function will blow up. Here is a patch born of about 5 mins of contemplation. It solved my immediate problem but it is certainly wrong. It breaks absolute targets (which I think are handled correctly by the original version). I'm not even sure that it correctly handles *all* relative targets. It also needs to treat the case of a non-existent symlink target (where file-symlink-p returns t). It might be safer also to check if the file attributes are nil and deal with that, instead of blowing up. --8<---------------cut here---------------start------------->8--- diff --git a/lisp/org-publish.el b/lisp/org-publish.el index e944eea..dd192d6 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -1150,7 +1150,7 @@ Returns value on success, else nil." (defun org-publish-cache-ctime-of-src (filename) "Get the FILENAME ctime as an integer." (let ((src-attr (file-attributes (if (stringp (file-symlink-p filename)) - (file-symlink-p filename) + (concat (file-name-directory filename) (file-symlink-p filename)) filename)))) (+ (lsh (car (nth 5 src-attr)) 16) --8<---------------cut here---------------end--------------->8--- Nick