emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Sebastian Rose <sebastian_rose@gmx.de>
To: Aidan Gauland <aidalgol@no8wireless.co.nz>
Cc: emacs-orgmode@gnu.org
Subject: Re: Re: [Patch] Re: Bug? Inconsistency with org-publish-attachment
Date: Fri, 17 Sep 2010 00:44:12 +0200	[thread overview]
Message-ID: <878w31qpfn.fsf@gmx.de> (raw)
In-Reply-To: <loom.20100916T222719-971@post.gmane.org> (Aidan Gauland's message of "Thu, 16 Sep 2010 20:33:18 +0000 (UTC)")

[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]

Aidan Gauland <aidalgol@no8wireless.co.nz> writes:
> Sebastian Rose <sebastian_rose <at> gmx.de> writes:
>> `org-publish-attachment' is wrong or called with wrong arguments.
>> 
>> This patch fixes it.
>> 
>> As always, there might be a better way to fix it,
>> but this way the function `org-publish-attachment' will work regardless
>> of parameters.  Someone will always call this function with the wrong
>> `PUB-DIR' parameter...
>> 
>> Aidan, would like to apply the patch and verify it works for you?
>
> That fixes the problem, but introduces/reveals another:
>
> All symlinks in artsy/photography/images/ are dereferenced and copied
> to published/artsy/photography/images/, but all regular files in
> artsy/photography/images/ are copied to
> published/artsy/photography/images/artsy/photography/images/.
>
> So the patch works only if there are only symlinks.  (Not sure about
> only regular files.  It may have broken something.)


Arrrgh, yes...

So my first guess was the better one.

This here works for both --- here it does.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: org-publish-correct-target-directory-2.patch --]
[-- Type: text/x-diff, Size: 731 bytes --]

diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index de52410..90b0339 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -601,13 +601,13 @@ See `org-publish-projects'."
 		  (error "File %s not part of any known project"
 			 (abbreviate-file-name filename)))))
 	 (project-plist (cdr project))
-	 (ftname (file-truename filename))
+	 (ftname (expand-file-name filename))
 	 (publishing-function
 	  (or (plist-get project-plist :publishing-function)
 	      'org-publish-org-to-html))
 	 (base-dir
 	  (file-name-as-directory
-	   (file-truename
+	   (expand-file-name
 	    (or (plist-get project-plist :base-directory)
 		(error "Project %s does not have :base-directory defined"
 		       (car project))))))

[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

  reply	other threads:[~2010-09-16 22:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-15  2:15 Bug? Inconsistency with org-publish-attachment Aidan Gauland
2010-09-15 16:04 ` Sebastian Rose
2010-09-15 19:26   ` Emacs version Sébastien Vauban
2010-09-15 20:11     ` Henri-Paul Indiogine
2010-09-15 20:57       ` A. Ryan Reynolds
2010-09-16 19:27         ` Gregor Zattler
2010-09-15 22:31     ` Sebastian Rose
2010-09-16  3:16       ` suvayu ali
2010-09-16  8:11         ` Scot Becker
2010-09-15 20:23   ` Bug? Inconsistency with org-publish-attachment Aidan Gauland
2010-09-15 22:40     ` Sebastian Rose
2010-09-16  3:15       ` Aidan Gauland
2010-09-16 12:23         ` [Patch] " Sebastian Rose
2010-09-16 20:33           ` Aidan Gauland
2010-09-16 22:44             ` Sebastian Rose [this message]
2010-09-17  1:09               ` Aidan Gauland
2010-09-17  9:16                 ` Sebastian Rose
2010-09-17 20:21                   ` [Patch] Bug: " Aidan Gauland
2010-09-17 22:18                     ` Sebastian Rose
2010-09-17 23:12                       ` Aidan Gauland
2010-09-17 23:18                         ` Sebastian Rose
2010-09-16 22:45             ` Re: [Patch] Re: Bug? " Sebastian Rose

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878w31qpfn.fsf@gmx.de \
    --to=sebastian_rose@gmx.de \
    --cc=aidalgol@no8wireless.co.nz \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).