From: Joey Hess <joey@kitenet.net>
Date: Mon, 27 Sep 2010 02:27:46 +0000 (-0400)
Subject: Propigate PATH into wrapper.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/1883e31de2044eba87035c7bbb4b34c45fefa432?hp=5d201da7188e39787fe08485113300d8e590ba58

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 927368fae..5eb96f4ae 100644
--- 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 cae182f63..97f9d3c79 100644
--- 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