autoproj 1.13.0.b4 → 1.13.0.b5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7557ff9fad5a370e5cc7988a711831e62c33a3
-  data.tar.gz: 621912f3aa71dee3de8a88101540ec44b8fc2160
+  metadata.gz: 4ead993a2bcf47653aff8ed671871ea70739c7c8
+  data.tar.gz: 920ecacf47f05a0d8b4fa3e86acf158dcc46cf5e
 SHA512:
-  metadata.gz: 9c7ac823f52ab7e75c9c3ba89a9a639d01d9fa6560ce9142c223ff8e4bad6b50d45c70559042919a9aa5c10dae7e8d7400aa10e6859441e949723c1fb91b86c6
-  data.tar.gz: eb4f9a03b3c7d649c3460567935d906e638251d35f8f5dd3167604408cc98b93f056babf630f77cb4ea0352c26ee79d6cd61917a4cdecc3f56785a1802d015f8
+  metadata.gz: 440f4486bca0cc857c369a9a8bcaeb231b7059b9e536d38edd2826e2e4dc0caba951566dbb7363abe19e4b8548b3f4413c89d15ad3a84a694a30f17d35563530
+  data.tar.gz: f8c9d4d718c301e5ddfdfdbf3667ecf72cbba05c6ce5216324b98940d4d2e6abda775ce2ae13a5fc7a17a30bc3ab03d5f0c8c769d70f1ab4dd121e7c3a51f9fd

data/bin/autoproj_bootstrap

@@ -2981,10 +2981,10 @@ cmake:
   opensuse: cmake
 autotools:
   debian,ubuntu:
-  - automake1.9
+  - automake
   - autoconf
   gentoo:
-  - sys-devel/automake:1.9
+  - sys-devel/automake
   - sys-devel/autoconf
   arch:
   - automake

data/lib/autoproj/default.osdeps

@@ -142,10 +142,10 @@ cmake:
 
 autotools:
   debian,ubuntu:
-  - "automake1.9"
+  - automake
   - autoconf
   gentoo:
-  - "sys-devel/automake:1.9"
+  - "sys-devel/automake"
   - sys-devel/autoconf
   arch: 
   - automake 

data/lib/autoproj/ops/snapshot.rb

@@ -229,6 +229,8 @@ module Autoproj
                 cacheinfo = cacheinfo.join(",")
             end
 
+            parent_id ||= importer.rev_parse(pkg, 'HEAD')
+
             # Create the tree using a temporary index in order to not mess with
             # the user's index state. read-tree initializes the new index and
             # then we add the overrides file with update-index / write-tree
@@ -236,7 +238,7 @@ module Autoproj
             FileUtils.rm_f our_index
             begin
                 ENV['GIT_INDEX_FILE'] = our_index
-                importer.run_git_bare(pkg, 'read-tree', 'HEAD')
+                importer.run_git_bare(pkg, 'read-tree', parent_id)
                 # And add the new file
                 importer.run_git_bare(
                     pkg, 'update-index',
@@ -247,8 +249,6 @@ module Autoproj
                 FileUtils.rm_f our_index
             end
 
-            parent_id ||= importer.rev_parse(pkg, 'HEAD')
-
             importer.run_git_bare(
                 pkg, 'commit-tree',
                 tree_id, '-p', parent_id, input_streams: [message]).first

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.0.b4"
+    VERSION = "1.13.0.b5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0.b4
+  version: 1.13.0.b5
 platform: ruby
 authors:
 - Rock Core Developers
@@ -250,11 +250,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
-test_files:
-- test/package_managers/test_apt_dpkg_manager.rb
-- test/package_managers/test_gem.rb
-- test/package_managers/test_pip.rb
-- test/test_manifest.rb
-- test/test_os_dependencies.rb
-- test/test_package_manifest.rb
-- test/ops/test_configuration.rb
+test_files: []