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 +4 -4
- data/lib/autoproj/cli/update.rb +7 -7
- data/lib/autoproj/os_package_installer.rb +7 -7
- data/lib/autoproj/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 04ec9441fdf0ffd2541d5bf217412d4f153f77b6
|
4
|
+
data.tar.gz: e1c4e19cee12aa7629a1fcbe19d5c9c9ad8be340
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 86a003101f5024f513b7c93ee4749aa8e9097f85a6c10eb13666fc56dcaf3b3cb7c0eef28dbf556343408a942afe240b3f39e4d977c9073e93744edbccdcaf43
|
7
|
+
data.tar.gz: 58780f3613e8d50c1890cfa3c95efcd51d6f4e3e1ca5aa000e74dfe07324aad389c3b78882878a3db0a223bf9b1f7c74b066f4e08fdd0c7281bebc68fa38db89
|
data/lib/autoproj/cli/update.rb
CHANGED
@@ -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
|
-
|
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
|
-
|
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
|
-
'
|
26
|
-
'
|
27
|
-
'
|
28
|
-
'
|
29
|
-
'
|
30
|
-
'
|
31
|
-
'
|
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
|
data/lib/autoproj/version.rb
CHANGED
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.
|
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-
|
11
|
+
date: 2015-10-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: autobuild
|