bin/autoproj_bootstrap in autoproj-1.7.10 vs bin/autoproj_bootstrap in autoproj-1.7.11.rc1

@@ -430,17 +430,15 @@
             os_names, os_versions = OSDependencies.operating_system
 
             dep_def = definitions[name]
             if !dep_def
                 return NO_PACKAGE
-            end
-
-            if dep_def == 'ignore'
+            elsif dep_def == 'ignore'
                 return IGNORE
-            end
-
-            if !os_names
+            elsif dep_def == 'nonexistent'
+                return WRONG_OS_VERSION
+            elsif !os_names
                 return UNKNOWN_OS
             end
 
             # Find a matching entry for the OS name
             os_entry = nil
@@ -476,10 +474,14 @@
                     return WRONG_OS_VERSION
                 end
                 data = version_entry.last
             end
 
+            if data.respond_to?(:to_str) && data.to_str == 'nonexistent'
+                return WRONG_OS_VERSION
+            end
+
             if data.respond_to?(:to_ary)
 		# List of packages
                 return [PACKAGES, data]
             elsif data.respond_to?(:to_str)
 		# Single package
@@ -600,9 +602,10 @@
                 pkg_def = pkg_def.dup
 
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
                     when "ignore" then
+                        osdeps << name
                     when "gem" then
                         gems << name
                     else
                         # This is *not* handled later, as is the absence of a
                         # package definition. The reason is that it is a bad