[PATCH] Autobuild - fixes for macos

[Matthias Goldhoorn]

---
 lib/autoproj/manifest.rb |    1 +
 lib/autoproj/osdeps.rb   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/autoproj/manifest.rb b/lib/autoproj/manifest.rb
index 8ec2e2f..09274fa 100644
--- a/lib/autoproj/manifest.rb
+++ b/lib/autoproj/manifest.rb
@@ -1110,6 +1110,7 @@ def ignored?(package_name)
 
         # Enumerates the package names of all ignored packages
         def each_ignored_package
+            return if !data['ignore_packages']
             data['ignore_packages'].each do |l|
                 if pkg_set = metapackages[l]
                     pkg_set.each_package do |pkg|
diff --git a/lib/autoproj/osdeps.rb b/lib/autoproj/osdeps.rb
index 1320807..f174c5e 100644
--- a/lib/autoproj/osdeps.rb
+++ b/lib/autoproj/osdeps.rb
@@ -771,7 +771,7 @@ def self.operating_system(options = Hash.new)
                         [['gentoo'], [version]]
                     elsif File.exists?('/etc/arch-release')
                         [['arch'], []]
-                    elseif `uname`.chomp == "Darwin"
+                    elsif Autobuild.macos? 
                         version=`sw_vers | head -2 | tail -1`.split(":")[1]
                         [['darwin'], [version.strip]]
                     elsif Autobuild.windows?
-- 
1.7.10.4


--------------080005040604020703030109
Content-Type: text/x-patch;
 name="0001-Autobuild-fixes-for-macos.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-Autobuild-fixes-for-macos.patch"