From 636dac0393c550281413abba86ff26e7e4bd5b56 Mon Sep 17 00:00:00 2001
From: Bob Clary <bclary@bclary.com>
Date: Tue, 18 Aug 2009 00:29:59 -0700
Subject: [PATCH] bug 509266 - Sisyphus - Ubuntu 9.04 issues: will not read
 environment strings from set pipe, autoconf detection, r=ctalbert.

---
 testing/sisyphus/bin/build.sh  | 2 ++
 testing/sisyphus/bin/memory.pl | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/testing/sisyphus/bin/build.sh b/testing/sisyphus/bin/build.sh
index 5212707f9992..53f6453623a4 100755
--- a/testing/sisyphus/bin/build.sh
+++ b/testing/sisyphus/bin/build.sh
@@ -126,6 +126,8 @@ case $product in
                     AUTOCONF=autoconf-2.13
                 elif findprogram autoconf-2.13; then
                     AUTOCONF=autoconf-2.13
+                elif findprogram autoconf2.13; then
+                    AUTOCONF=autoconf2.13
                 elif findprogram autoconf213; then
                     AUTOCONF=autoconf213
                 else
diff --git a/testing/sisyphus/bin/memory.pl b/testing/sisyphus/bin/memory.pl
index 0ffb203d51c1..06a9db565794 100755
--- a/testing/sisyphus/bin/memory.pl
+++ b/testing/sisyphus/bin/memory.pl
@@ -49,8 +49,10 @@ my $ulimit_virtualmemory = 0;
 my $test_memory = 0;
 
 # hack around lack of available environment entries in both
-# cygwin perl and redhat perl
-open OSTYPE, "set | grep OSTYPE |" || die "Unable to open OSTYPE: $!";
+# cygwin perl and redhat perl.
+# Note the bash -c set is required for ubuntu 9.04 otherwise the
+# OSTYPE file will return no data. I don't know why.
+open OSTYPE, "bash -c set | grep OSTYPE |" || die "Unable to open OSTYPE: $!";
 while (<OSTYPE>)
 {
     chomp;