lib/autoproj/autobuild.rb in autoproj-2.0.0.rc5 vs lib/autoproj/autobuild.rb in autoproj-2.0.0.rc6

@@ -467,11 +467,11 @@
             [name]
         else name
         end
     end
 
-    os_names, os_versions = Autoproj::OSPackageResolver.operating_system
+    os_names, os_versions = Autoproj.workspace.operating_system
     matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
     if matching_archs.empty?
         return
     elsif matching_archs.none? { |arch| !arch[1] || os_versions.include?(arch[1].downcase) }
         return
@@ -492,10 +492,10 @@
             [name]
         else name
         end
     end
 
-    os_names, os_versions = Autoproj::OSPackageResolver.operating_system
+    os_names, os_versions = Autoproj.workspace.operating_system
     matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
     if matching_archs.empty?
         return yield
     elsif matching_archs.all? { |arch| arch[1] && !os_versions.include?(arch[1].downcase) }
         return yield