autoproj 1.8.2.b1 → 1.8.2.b2
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.
- data/lib/autoproj/gitorious.rb +1 -33
- data/lib/autoproj/version.rb +1 -1
- metadata +11 -11
data/lib/autoproj/gitorious.rb
CHANGED
|
@@ -48,38 +48,6 @@ module Autoproj
|
|
|
48
48
|
end
|
|
49
49
|
Autoproj.change_option("#{name}_PUSH_ROOT", "git@#{base_url}:")
|
|
50
50
|
|
|
51
|
-
# If running on a recent enough autobuild version, register a fallback to
|
|
52
|
-
# use http when git fails
|
|
53
|
-
if Autobuild::Importer.respond_to?(:fallback) && options[:fallback_to_http]
|
|
54
|
-
Autobuild::Importer.fallback do |package, importer|
|
|
55
|
-
root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
|
|
56
|
-
if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
|
|
57
|
-
Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
|
|
58
|
-
|
|
59
|
-
base_replace_string = "http://git.#{base_url}"
|
|
60
|
-
Autobuild::Package.each do |pkg_name, pkg|
|
|
61
|
-
if pkg.importer.kind_of?(Autobuild::Git) && pkg.importer.repository =~ root_rx
|
|
62
|
-
if pkg.importer.repository =~ /^git@/
|
|
63
|
-
replace_string = "#{base_replace_string}/"
|
|
64
|
-
else
|
|
65
|
-
replace_string = base_replace_string
|
|
66
|
-
end
|
|
67
|
-
pkg.importer.repository.gsub!(root_rx, replace_string)
|
|
68
|
-
end
|
|
69
|
-
end
|
|
70
|
-
|
|
71
|
-
http_importer = importer.dup
|
|
72
|
-
if http_importer.repository =~ /^git@/
|
|
73
|
-
replace_string = "#{base_replace_string}/"
|
|
74
|
-
else
|
|
75
|
-
replace_string = base_replace_string
|
|
76
|
-
end
|
|
77
|
-
http_importer.repository = importer.repository.gsub(root_rx, replace_string)
|
|
78
|
-
http_importer
|
|
79
|
-
end
|
|
80
|
-
end
|
|
81
|
-
end
|
|
82
|
-
|
|
83
51
|
Autoproj.add_source_handler name.downcase do |url, options|
|
|
84
52
|
if url !~ /\.git$/
|
|
85
53
|
url += ".git"
|
|
@@ -89,7 +57,7 @@ module Autoproj
|
|
|
89
57
|
end
|
|
90
58
|
pull_base_url = Autoproj.user_config("#{name}_ROOT")
|
|
91
59
|
push_base_url = Autoproj.user_config("#{name}_PUSH_ROOT")
|
|
92
|
-
Hash[:type => 'git', :url => "#{pull_base_url}#{url}", :push_to => "#{push_base_url}#{url}"].merge(options)
|
|
60
|
+
Hash[:type => 'git', :url => "#{pull_base_url}#{url}", :push_to => "#{push_base_url}#{url}", :retry_count => 10].merge(options)
|
|
93
61
|
end
|
|
94
62
|
end
|
|
95
63
|
end
|
data/lib/autoproj/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: autoproj
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.8.2.
|
|
4
|
+
version: 1.8.2.b2
|
|
5
5
|
prerelease: 6
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2012-09-22 00:00:00.000000000 Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: autobuild
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &9206920 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ! '>='
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 1.6.0.rc1
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *9206920
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: utilrb
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &9206140 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ! '>='
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 1.6.0
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *9206140
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: highline
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &9205300 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: 1.5.0
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *9205300
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rdoc
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &9204600 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ~>
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: '3.10'
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *9204600
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: hoe
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &9203860 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ~>
|
|
@@ -65,7 +65,7 @@ dependencies:
|
|
|
65
65
|
version: '3.1'
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *9203860
|
|
69
69
|
description: autoproj is a manager for sets of software packages. It allows the user
|
|
70
70
|
to import and build packages from source, still using the underlying distribution's
|
|
71
71
|
native package manager for software that is available on it.
|