autoproj 2.8.0 → 2.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/autoproj/ops/install.rb +3 -3
- data/lib/autoproj/package_managers/bundler_manager.rb +5 -2
- data/lib/autoproj/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6e6d1d36a0d083b3d1b2e36e03fc6cc30844ee81ff9e059fa5f02b56436256b3
|
|
4
|
+
data.tar.gz: ed32703bbd7587d542efa5f046dbf94fb6457d0c8138b9e2314ef87a665c4573
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fd2e91fcd355e19b2cf9b1f0bedde1cf28ac0ba8aca1239eec23dfd45a848007a335efe6745a3948e2613a81f844b6778ed7a4bdb268b587ca2c45c2b64d7f0c
|
|
7
|
+
data.tar.gz: 2ddd52ea6026339b5b3139e1b0d87d041fcef06c084338485e7a99ceda5d3a7b203b5741b50d14c22522cc2e6baa5afb9831844a21d5691d984b596c493ce957
|
data/lib/autoproj/ops/install.rb
CHANGED
|
@@ -284,7 +284,7 @@ module Autoproj
|
|
|
284
284
|
out: '/dev/null')
|
|
285
285
|
return if !result
|
|
286
286
|
|
|
287
|
-
bundler_path = File.join(gems_gem_home, 'bin', '
|
|
287
|
+
bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
|
|
288
288
|
if File.exist?(bundler_path)
|
|
289
289
|
bundler_path
|
|
290
290
|
end
|
|
@@ -304,14 +304,14 @@ module Autoproj
|
|
|
304
304
|
'--env-shebang', '--no-document', '--no-format-executable',
|
|
305
305
|
'--clear-sources', '--source', gem_source,
|
|
306
306
|
*local, "--bindir=#{File.join(gems_gem_home, 'bin')}",
|
|
307
|
-
'
|
|
307
|
+
'bundle', **redirection)
|
|
308
308
|
|
|
309
309
|
if !result
|
|
310
310
|
STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
|
|
311
311
|
nil
|
|
312
312
|
end
|
|
313
313
|
|
|
314
|
-
bundler_path = File.join(gems_gem_home, 'bin', '
|
|
314
|
+
bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
|
|
315
315
|
if File.exist?(bundler_path)
|
|
316
316
|
bundler_path
|
|
317
317
|
else
|
|
@@ -51,7 +51,7 @@ module Autoproj
|
|
|
51
51
|
env.set('BUNDLE_GEMFILE', gemfile_path)
|
|
52
52
|
end
|
|
53
53
|
|
|
54
|
-
Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', '
|
|
54
|
+
Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundle')
|
|
55
55
|
|
|
56
56
|
env.init_from_env 'RUBYLIB'
|
|
57
57
|
env.inherit 'RUBYLIB'
|
|
@@ -363,7 +363,10 @@ module Autoproj
|
|
|
363
363
|
backup_restore(backups)
|
|
364
364
|
raise
|
|
365
365
|
ensure
|
|
366
|
-
|
|
366
|
+
if binstubs_path
|
|
367
|
+
FileUtils.rm_f File.join(binstubs_path, 'bundle')
|
|
368
|
+
FileUtils.rm_f File.join(binstubs_path, 'bundler')
|
|
369
|
+
end
|
|
367
370
|
backup_clean(backups)
|
|
368
371
|
end
|
|
369
372
|
|
data/lib/autoproj/version.rb
CHANGED