autoproj 2.0.0.rc13 → 2.0.0.rc14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d8151e59a3c0da556606a3a218bd89372b93f238
4
- data.tar.gz: 50daf836ced22f12c40bd76cb847db3c3affae62
3
+ metadata.gz: 04ec9441fdf0ffd2541d5bf217412d4f153f77b6
4
+ data.tar.gz: e1c4e19cee12aa7629a1fcbe19d5c9c9ad8be340
5
5
  SHA512:
6
- metadata.gz: 69f7fad5bdc6befbe1968aecee7612ef8cc2eabcb8a6a8ff5f80e9327abb17258eabe979ca675d508623a2c7bbf647da58f0232b9a82689ff07864a7c0e2e5a3
7
- data.tar.gz: ac5d22bfdc874f48b8ed7a66c773b8006dfebac404c00df64edfcc44877043c079b6fd0f30708581bd973aca50f95c4113cd4918daf965423589e23f9e33f77c
6
+ metadata.gz: 86a003101f5024f513b7c93ee4749aa8e9097f85a6c10eb13666fc56dcaf3b3cb7c0eef28dbf556343408a942afe240b3f39e4d977c9073e93744edbccdcaf43
7
+ data.tar.gz: 58780f3613e8d50c1890cfa3c95efcd51d6f4e3e1ca5aa000e74dfe07324aad389c3b78882878a3db0a223bf9b1f7c74b066f4e08fdd0c7281bebc68fa38db89
@@ -35,6 +35,7 @@ def validate_options(packages, options)
35
35
  end
36
36
 
37
37
  def run(selected_packages, options)
38
+ explicit_selection = !selected_packages.empty?
38
39
  selected_packages, config_selected =
39
40
  normalize_command_line_package_selection(selected_packages)
40
41
 
@@ -43,22 +44,21 @@ def run(selected_packages, options)
43
44
  update_autoproj =
44
45
  (options[:autoproj] || (
45
46
  options[:autoproj] != false &&
46
- selected_packages.empty? &&
47
+ !explicit_selection &&
47
48
  !options[:config] &&
48
49
  !options[:checkout_only])
49
50
  )
50
51
 
51
52
  update_config =
52
- (options[:config] || (
53
+ (options[:config] || config_selected || (
53
54
  options[:config] != false &&
54
- selected_packages.empty? &&
55
- !options[:autoproj]) ||
56
- config_selected)
55
+ !explicit_selection &&
56
+ !options[:autoproj]))
57
57
 
58
58
  update_packages =
59
59
  options[:all] ||
60
- !selected_packages.empty? ||
61
- (!options[:config] && !options[:autoproj])
60
+ (explicit_selection && !selected_packages.empty?) ||
61
+ (!explicit_selection && !options[:config] && !options[:autoproj])
62
62
 
63
63
  ws.setup
64
64
  parallel = options[:parallel] || ws.config.parallel_import_level
@@ -22,13 +22,13 @@ class OSPackageInstaller
22
22
  'apt-dpkg' => PackageManagers::AptDpkgManager,
23
23
  'gem' => PackageManagers::BundlerManager,
24
24
  'emerge' => PackageManagers::EmergeManager,
25
- 'brew' => PackageManagers::PacmanManager,
26
- 'pacman' => PackageManagers::HomebrewManager,
27
- 'pip' => PackageManagers::YumManager,
28
- 'pkg' => PackageManagers::PortManager,
29
- 'macports' => PackageManagers::ZypperManager,
30
- 'yum' => PackageManagers::PipManager ,
31
- 'zypper' => PackageManagers::PkgManager
25
+ 'pacman' => PackageManagers::PacmanManager,
26
+ 'brew' => PackageManagers::HomebrewManager,
27
+ 'yum' => PackageManagers::YumManager,
28
+ 'macports' => PackageManagers::PortManager,
29
+ 'zypper' => PackageManagers::ZypperManager,
30
+ 'pip' => PackageManagers::PipManager ,
31
+ 'pkg' => PackageManagers::PkgManager
32
32
  ]
33
33
 
34
34
  attr_reader :os_package_resolver
@@ -1,3 +1,3 @@
1
1
  module Autoproj
2
- VERSION = "2.0.0.rc13"
2
+ VERSION = "2.0.0.rc14"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autoproj
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc13
4
+ version: 2.0.0.rc14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sylvain Joyeux
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-22 00:00:00.000000000 Z
11
+ date: 2015-10-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: autobuild