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
be275692
Commit
be275692
authored
May 11, 2012
by
Gwendal Roué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#221] robustness against nil file lists (such as public_header_files)
parent
0aea0bef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
spec.rb
lib/cocoapods/command/spec.rb
+1
-0
local_pod.rb
lib/cocoapods/local_pod.rb
+1
-0
No files found.
lib/cocoapods/command/spec.rb
View file @
be275692
...
@@ -302,6 +302,7 @@ module Pod
...
@@ -302,6 +302,7 @@ module Pod
patterns
=
spec
.
send
(
accessor
.
to_sym
)
patterns
=
spec
.
send
(
accessor
.
to_sym
)
# Some values are multiplaform
# Some values are multiplaform
patterns
=
patterns
.
is_a?
(
Hash
)
?
patterns
.
values
.
flatten
(
1
)
:
patterns
patterns
=
patterns
.
is_a?
(
Hash
)
?
patterns
.
values
.
flatten
(
1
)
:
patterns
patterns
=
patterns
.
compact
# some patterns may be nil (public_header_files, for instance)
patterns
.
each
do
|
pattern
|
patterns
.
each
do
|
pattern
|
# Skip Filelist that would otherwise be resolved from the working directory resulting
# Skip Filelist that would otherwise be resolved from the working directory resulting
# in a potentially very expensi operation
# in a potentially very expensi operation
...
...
lib/cocoapods/local_pod.rb
View file @
be275692
...
@@ -139,6 +139,7 @@ module Pod
...
@@ -139,6 +139,7 @@ module Pod
def
expanded_paths
(
platforms_with_patterns
,
options
=
{})
def
expanded_paths
(
platforms_with_patterns
,
options
=
{})
patterns
=
platforms_with_patterns
.
is_a?
(
Hash
)
?
platforms_with_patterns
[
@platform
.
name
]
:
platforms_with_patterns
patterns
=
platforms_with_patterns
.
is_a?
(
Hash
)
?
platforms_with_patterns
[
@platform
.
name
]
:
platforms_with_patterns
return
[]
if
patterns
.
nil?
# some patterns may be nil (specification.public_header_files, for instance)
patterns
.
map
do
|
pattern
|
patterns
.
map
do
|
pattern
|
pattern
=
root
+
pattern
pattern
=
root
+
pattern
...
...
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