From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Seeger Subject: [PATCH] Always add sitemap file to project files if sitemap is requested Date: Fri, 07 Jan 2011 14:42:22 +0100 Message-ID: <87fwt4keyp.wl%jan.seeger@thenybble.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/mixed; boundary="Multipart_Fri_Jan__7_14:42:22_2011-1" Return-path: Received: from [140.186.70.92] (port=36040 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PbCaQ-0002PL-Kw for emacs-orgmode@gnu.org; Fri, 07 Jan 2011 08:42:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PbCaP-0000yt-3A for emacs-orgmode@gnu.org; Fri, 07 Jan 2011 08:42:34 -0500 Received: from thenybble.de ([83.169.39.92]:48885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PbCaO-0000yO-UD for emacs-orgmode@gnu.org; Fri, 07 Jan 2011 08:42:33 -0500 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 --Multipart_Fri_Jan__7_14:42:22_2011-1 Content-Type: text/plain; charset=US-ASCII Greetings! I noticed some wonkiness in getting my sitemap created on my webserver when pushing my website, and the problem seems to lie in org-publish-get-base-files only returning existing files, and not picking up on the soon to be generated sitemap. My patch always adds the sitemap file to the list of returned files if a sitemap is requested, regardless of if it exists or not. Regards, Jan Seeger --Multipart_Fri_Jan__7_14:42:22_2011-1 Content-Type: text/plain; type=patch; charset=US-ASCII Content-Disposition: attachment; filename="org-publish.patch" Content-Transfer-Encoding: 7bit diff --git a/lisp/org-publish.el b/lisp/org-publish.el index f29b402..baf282a 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -434,6 +434,9 @@ matching filenames." ;; org-publish-compare-directory-files: (sitemap-requested (plist-get project-plist :auto-sitemap)) + (sitemap-filename + (or (plist-get project-plist :sitemap-filename) + "sitemap.org")) (sitemap-sort-folders (if (plist-member project-plist :sitemap-sort-folders) (plist-get project-plist :sitemap-sort-folders) @@ -454,6 +457,9 @@ matching filenames." (setq sitemap-sort-folders nil)) (setq org-publish-temp-files nil) + (if sitemap-requested + (pushnew (expand-file-name (concat base-dir sitemap-filename)) + org-publish-temp-files)) (org-publish-get-base-files-1 base-dir recurse match ;; FIXME distinguish exclude regexp ;; for skip-file and skip-dir? --Multipart_Fri_Jan__7_14:42:22_2011-1 Content-Type: text/plain; charset=US-ASCII --Multipart_Fri_Jan__7_14:42:22_2011-1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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 --Multipart_Fri_Jan__7_14:42:22_2011-1--