Re: [BUG] bug in org-publish and a (wrong) patch

[Nick Dokos <nicholas.dokos@hp.com>]

Carsten Dominik <carsten.dominik@gmail.com> wrote:

> Hi Nick,
> 
> I have not looked closely, but maybe you can use
> 
> 
> (expand-file-name  .... (file-name-directory filename))
> 
> to fix this patch?  Not sure, I have not spent any time on it.
> 

Almost but not quite: C-h v expand-file-name says

,----
| (expand-file-name NAME &optional DEFAULT-DIRECTORY)
| 
| Convert filename NAME to absolute, and canonicalize it.
| Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
| (does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
| the current buffer's value of `default-directory' is used.
`----

so you end up tacking it onto a completely unrelated directory (and my
experiments confirm this).

But there is a :base-directory for the project that could be obtained
from the project-plist and passed to expand-file-name.  I think that
would work but would require passing the project-plist down through a couple
of layers to org-publish-cache-ctime-of-src. Alternatively, it (or just
the base directory) could be bound dynamically in org-publish-file and
used in the ctime function.

What do you think would be preferable?

Thanks,
Nick

> - Carsten
> 
> On Apr 7, 2011, at 7:11 AM, Nick Dokos wrote:
> 
> > 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
> > 
> 
> - Carsten
> 
> 
> 
>