Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
77f29854
Commit
77f29854
authored
Oct 04, 2014
by
Kyle Fuller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Fix issue inheriting pods into empty target
Fixes
https://github.com/CocoaPods/CocoaPods/issues/2591
parent
6cedabcb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
CHANGELOG.md
CHANGELOG.md
+5
-0
installer.rb
lib/cocoapods/installer.rb
+2
-2
No files found.
CHANGELOG.md
View file @
77f29854
...
@@ -55,6 +55,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
...
@@ -55,6 +55,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[
#2561
](
https://github.com/CocoaPods/CocoaPods/issues/2561
)
[
#2561
](
https://github.com/CocoaPods/CocoaPods/issues/2561
)
[
#2593
](
https://github.com/CocoaPods/CocoaPods/issues/2593
)
[
#2593
](
https://github.com/CocoaPods/CocoaPods/issues/2593
)
*
Fix a crash when running
`pod install`
with an empty target that inherits a
pod from a parent target.
[
Kyle Fuller
](
https://github.com/kylef
)
[
#2591
](
https://github.com/CocoaPods/CocoaPods/issues/2591
)
## 0.34.1
## 0.34.1
...
...
lib/cocoapods/installer.rb
View file @
77f29854
...
@@ -402,13 +402,13 @@ module Pod
...
@@ -402,13 +402,13 @@ module Pod
def
install_libraries
def
install_libraries
UI
.
message
'- Installing targets'
do
UI
.
message
'- Installing targets'
do
pod_targets
.
sort_by
(
&
:name
).
each
do
|
pod_target
|
pod_targets
.
sort_by
(
&
:name
).
each
do
|
pod_target
|
next
if
pod_target
.
target_definition
.
empty?
next
if
pod_target
.
target_definition
.
dependencies
.
empty?
target_installer
=
PodTargetInstaller
.
new
(
sandbox
,
pod_target
)
target_installer
=
PodTargetInstaller
.
new
(
sandbox
,
pod_target
)
target_installer
.
install!
target_installer
.
install!
end
end
aggregate_targets
.
sort_by
(
&
:name
).
each
do
|
target
|
aggregate_targets
.
sort_by
(
&
:name
).
each
do
|
target
|
next
if
target
.
target_definition
.
empty?
next
if
target
.
target_definition
.
dependencies
.
empty?
target_installer
=
AggregateTargetInstaller
.
new
(
sandbox
,
target
)
target_installer
=
AggregateTargetInstaller
.
new
(
sandbox
,
target
)
target_installer
.
install!
target_installer
.
install!
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment