bin/autoproj_bootstrap in autoproj-1.9.7.rc20 vs bin/autoproj_bootstrap in autoproj-1.9.7.rc21

- old
+ new

@@ -1,9 +1,9 @@ #! /usr/bin/ruby -if RUBY_VERSION < "1.8.7" - STDERR.puts "autoproj requires Ruby >= 1.8.7" +if RUBY_VERSION < "1.9.3" + STDERR.puts "autoproj requires Ruby >= 1.9.3" exit 1 end if defined? Encoding # This is a 1.9-only thing Encoding.default_internal = Encoding::UTF_8 @@ -124,10 +124,11 @@ end end end require 'tempfile' +require 'json' module Autoproj # Module that contains the package manager implementations for the # OSDependencies class module PackageManagers # Base class for all package managers. Subclasses must add the @@ -570,10 +571,11 @@ current_packages = [] is_installed = false dpkg_status.each do |line| line = line.chomp + line = line.encode( "UTF-8", "binary", :invalid => :replace, :undef => :replace) if line == "" if is_installed current_packages.each do |pkg| @installed_packages << pkg end @@ -2518,11 +2520,11 @@ - rubygems macos-port: - ruby19 - rake macos-brew: - - ruby193 + - gem: rake default: nonexistent opensuse: ruby19-devel arch: ignore ruby20: debian: @@ -2535,18 +2537,22 @@ - ruby - ruby-devel - rubygem-rake opensuse: ruby20-devel arch: ignore + macos-brew: + - gem: rake default: nonexistent ruby21: debian: - ruby2.1 - ruby2.1-dev - rake - rubygems-integration arch: ignore fedora: ruby-devel + macos-brew: + - gem: rake default: nonexistent build-essential: debian,ubuntu: build-essential gentoo: ignore arch: base-devel