Propigate PATH into wrapper.

In the last version, the ikiwiki script stopped setting PATH.
But that leads to gcc failing when run from websetup. See
http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 927368fae964d678ab04aa866154b61677f80176..5eb96f4ae0d168598fe9d6a54a644294fbcb517a 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -128,7 +128,7 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
-char *newenviron[$#envsave+6];
+char *newenviron[$#envsave+7];
 int i=0;
 
 void addenv(char *var, char *val) {
@@ -147,6 +147,7 @@ $check_commit_hook
 @wrapper_hooks
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
+       newenviron[i++]="PATH=$ENV{PATH}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
 #ifdef __TINYC__

diff --git a/debian/changelog b/debian/changelog
index cae182f636ec5628fc51e5f713c87fe82aaf1860..97f9d3c79a83619a16c6ecdd1c64a2dc0fcc9c0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low
 
   * meta: Ensure that the url specified by xrds-location is absolute.
   * attachment: Fix attachment file size display.
+  * Propigate PATH into wrapper.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 19 Sep 2010 20:13:06 -0400