autobuild.rb in autoproj-1.7.9

- old
+ new

@@ -114,10 +114,12 @@
 	    # Prefer OS packages to source packages
             if !explicit_selection 
                 if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
                     @os_packages << name
                     return
+                elsif osdeps_availability == Autoproj::OSDependencies::IGNORE
+                    return
                 end
 
                 if osdeps_availability == Autoproj::OSDependencies::UNKNOWN_OS
                     # If we can't handle that OS, but other OSes have a
                     # definition for it, we assume that it can be installed as
@@ -133,10 +135,10 @@
                 if !available_as_source
                     begin
                         # Call osdeps to get a proper error message
                         osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
                         Autoproj.osdeps.resolve_os_dependencies(osdeps)
-                    rescue ConfigError => e
+                    rescue Autoproj::ConfigError => e
                         if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
                             Autoproj.warn "in #{File.join(srcdir, 'manifest.xml')}: #{e.message}"
                             Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
                             @ignored_os_dependencies << name
                             # We are not asked to install OS packages, just ignore