# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1250791523 -7200
# Node ID f9a5bc9a4a24e95e004968baecb56ed51a0bd11b
# Parent  f322541f9c18940f6e7135d83fabf92fbb5b80bb
settings/loggedos: add really ugly hack to ascertain having tools/bin in PATH.

Apparently, we're not using tools/bin for direct-loggedos commands,
even when setting PATH in settings.py.

diff -r f322541f9c18 -r f9a5bc9a4a24 gub/loggedos.py
--- a/gub/loggedos.py	Thu Aug 20 20:03:37 2009 +0200
+++ b/gub/loggedos.py	Thu Aug 20 20:05:23 2009 +0200
@@ -7,6 +7,13 @@
 from gub import misc
 
 def system (logger, cmd, env=os.environ, ignore_errors=False):
+    # UGH, FIXME:
+    # There is loggedos usage that defies any PATH settings
+    tools_bin_dir = os.path.join (os.getcwd (), 'target/tools/root/usr/bin')
+    if not tools_bin_dir in env.get ('PATH', ''):
+        env['PATH'] = tools_bin_dir + misc.append_path (env.get ('PATH', ''))
+        logger.write_log ('COMMAND defies PATH:' + cmd + '\n', 'warning')
+
     logger.write_log ('invoking %(cmd)s\n' % locals (), 'command')
     proc = subprocess.Popen (cmd, bufsize=0, shell=True, env=env,
                              stdout=subprocess.PIPE,
diff -r f322541f9c18 -r f9a5bc9a4a24 gub/settings.py
--- a/gub/settings.py	Thu Aug 20 20:03:37 2009 +0200
+++ b/gub/settings.py	Thu Aug 20 20:05:23 2009 +0200
@@ -255,6 +255,9 @@
         # cd /x/y/z.  This terribly breaks stat restriction.
         os.environ['SHELLOPTS'] = 'nohistory:physical'
 
+        if not '%(tools_prefix)s/bin' in os.environ['PATH']:
+            os.environ['PATH'] = '%(tools_prefix)s/bin:' + os.environ['PATH']
+        
     def create_dirs (self): 
         for a in (
             'allsrcdir',