bin/autoproj_bootstrap in autoproj-1.7.18 vs bin/autoproj_bootstrap in autoproj-1.7.19.rc1
- old
+ new
@@ -610,15 +610,16 @@
# returns AVAILABLE. Otherwise, returns the same error code than
# resolve_package.
def availability_of(name)
osdeps, gemdeps = partition_packages([name].to_set)
if !osdeps.empty?
- status = resolve_package(name)
- if status.respond_to?(:to_ary) || status == IGNORE
- AVAILABLE
- else
- status
+ osdeps.each do |dep_name|
+ status = resolve_package(dep_name)
+ if !status.respond_to?(:to_ary) && status != IGNORE
+ return status
+ end
end
+ AVAILABLE
elsif !gemdeps.empty?
AVAILABLE
else
NO_PACKAGE
end