autoproj 1.7.14.rc4 → 1.7.14.rc5

data/bin/autoproj

@@ -183,8 +183,22 @@ EOTEXT
 
     if Autoproj::CmdLine.only_status?
         all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.status(all_enabled_packages)
-        exit(0)
+        result = Autoproj::CmdLine.status(all_enabled_packages)
+        if Autoproj::CmdLine.status_exit_code?
+            code = 0
+            if result.uncommitted
+                code |= 1
+            end
+            if result.local
+                code |= 2
+            end
+            if result.remote
+                code |= 4
+            end
+            exit(code)
+        else
+            exit(0)
+        end
     elsif Autoproj::CmdLine.check?
         all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
         Autoproj::CmdLine.check(all_enabled_packages)

data/bin/autoproj_bootstrap

@@ -616,7 +616,7 @@ fi
         #
         # Raises ConfigError if an error exists in the osdeps files, and returns
         # empty sets if the package can't be found
-        def partition_packages(package_set, package_osdeps = Hash.new)
+        def partition_packages(package_set)
             package_set = package_set.
                 map { |name| OSDependencies.aliases[name] || name }.
                 to_set
@@ -1003,7 +1003,7 @@ So, what do you want ? (all, ruby, os or none)
             packages -= installed_packages
             return if packages.empty?
 
-            osdeps, gems = partition_packages(packages, package_osdeps)
+            osdeps, gems = partition_packages(packages)
             if handled_os
                 os_names, _ = OSDependencies.operating_system
                 os_packages = resolve_os_dependencies(osdeps)

data/lib/autoproj/cmdline.rb

@@ -745,11 +745,15 @@ module Autoproj
             else true
             end
         end
+        def self.status_exit_code?
+            @status_exit_code
+        end
         def self.list_newest?; @list_newest end
         def self.parse_arguments(args, with_mode = true)
             @only_status = false
             @only_local  = false
             @show_osdeps = false
+            @status_exit_code = false
             @revshow_osdeps = false
             @osdeps_filter_uptodate = true
             @osdeps_forced_mode = nil
@@ -906,6 +910,9 @@ where 'mode' is one of:
                 opts.on("--local", "for status, do not access the network") do
                     @only_local = true
                 end
+                opts.on('--exit-code', 'in status mode, exit with a code that reflects the status of the installation (see documentation for details)') do
+                    @status_exit_code = true
+                end
                 opts.on('--randomize-layout', 'in build and full-build, generate a random layout') do
                     @randomize_layout = true
                     Autoproj.change_option('randomize_layout', true)
@@ -1103,8 +1110,10 @@ where 'mode' is one of:
             nil
         end
 
+        StatusResult = Struct.new :uncommitted, :local, :remote
         def self.display_status(packages)
             last_was_in_sync = false
+            result = StatusResult.new
 
             packages.each do |pkg|
                 lines = []
@@ -1125,6 +1134,7 @@ where 'mode' is one of:
                     status = pkg.importer.status(pkg,@only_local)
                     if status.uncommitted_code
                         lines << Autoproj.color("  contains uncommitted modifications", :red)
+                        result.uncommitted = true
                     end
 
                     case status.status
@@ -1141,16 +1151,20 @@ where 'mode' is one of:
                             lines << Autoproj.color("  local and remote are in sync", :green)
                         end
                     when Autobuild::Importer::Status::ADVANCED
+                        result.local = true
                         lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :magenta)
                         status.local_commits.each do |line|
                             lines << Autoproj.color("    #{line}", :magenta)
                         end
                     when Autobuild::Importer::Status::SIMPLE_UPDATE
+                        result.remote = true
                         lines << Autoproj.color("  remote contains #{status.remote_commits.size} commit that local does not have:", :magenta)
                         status.remote_commits.each do |line|
                             lines << Autoproj.color("    #{line}", :magenta)
                         end
                     when Autobuild::Importer::Status::NEEDS_MERGE
+                        result.local  = true
+                        result.remote = true
                         lines << Autoproj.color("  local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each", :magenta)
                         lines << "  -- local commits --"
                         status.local_commits.each do |line|
@@ -1180,6 +1194,7 @@ where 'mode' is one of:
             if last_was_in_sync
                 Autoproj.progress(": local and remote are in sync", :green)
             end
+            return result
         end
 
         def self.status(packages)
@@ -1557,7 +1572,7 @@ export PATH=$GEM_HOME/bin:$PATH
 
             ospkg_to_pkg.each do |pkg_osdep, pkgs|
                 osdeps, gems = Autoproj.osdeps.
-                    partition_packages([pkg_osdep], ospkg_to_pkg)
+                    partition_packages([pkg_osdep])
 
                 gems.each do |gem_name|
                     mapping[gem_name.join(" ")][1] = true
@@ -1620,7 +1635,7 @@ export PATH=$GEM_HOME/bin:$PATH
                 end
 
                 osdeps, gems = Autoproj.osdeps.
-                    partition_packages(pkg_osdeps, ospkg_to_pkg)
+                    partition_packages(pkg_osdeps)
 
                 puts "  #{pkg_name}:"
                 if !gems.empty?

data/lib/autoproj/manifest.rb

@@ -1687,7 +1687,7 @@ module Autoproj
                 # a proper error message.
                 if !available_as_source
                     begin
-                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
+                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set)
                         Autoproj.osdeps.resolve_os_dependencies(osdeps)
                     rescue Autoproj::ConfigError => e
                         if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?

data/lib/autoproj/osdeps.rb

@@ -517,7 +517,7 @@ fi
         #
         # Raises ConfigError if an error exists in the osdeps files, and returns
         # empty sets if the package can't be found
-        def partition_packages(package_set, package_osdeps = Hash.new)
+        def partition_packages(package_set)
             package_set = package_set.
                 map { |name| OSDependencies.aliases[name] || name }.
                 to_set
@@ -904,7 +904,7 @@ So, what do you want ? (all, ruby, os or none)
             packages -= installed_packages
             return if packages.empty?
 
-            osdeps, gems = partition_packages(packages, package_osdeps)
+            osdeps, gems = partition_packages(packages)
             if handled_os
                 os_names, _ = OSDependencies.operating_system
                 os_packages = resolve_os_dependencies(osdeps)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.14.rc4"
+    VERSION = "1.7.14.rc5"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424061
+  hash: 15424063
   prerelease: 7
   segments: 
   - 1
   - 7
   - 14
   - rc
-  - 4
-  version: 1.7.14.rc4
+  - 5
+  version: 1.7.14.rc5
 platform: ruby
 authors: 
 - Sylvain Joyeux