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
9fd24443
Unverified
Commit
9fd24443
authored
Jun 21, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UI] Ensure printing a path does not raise
parent
3227fa60
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
CHANGELOG.md
CHANGELOG.md
+5
-1
user_interface.rb
lib/cocoapods/user_interface.rb
+5
-1
No files found.
CHANGELOG.md
View file @
9fd24443
...
@@ -26,7 +26,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -26,7 +26,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Fix local pod platform conflict error message.
*
Fix local pod platform conflict error message.
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
Muhammed Yavuz Nuzumlalı
](
https://github.com/manuyavuz
)
[
#5052
](
https://github.com/CocoaPods/CocoaPods/issues/5052
)
[
#5052
](
https://github.com/CocoaPods/CocoaPods/issues/5052
)
*
Fix installing pods with
`use_frameworks`
when deduplication is disabled.
*
Fix installing pods with
`use_frameworks`
when deduplication is disabled.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#5481
](
https://github.com/CocoaPods/CocoaPods/issues/5481
)
[
#5481
](
https://github.com/CocoaPods/CocoaPods/issues/5481
)
...
@@ -51,6 +51,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -51,6 +51,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Daniel Tomlinson
](
https://github.com/dantoml
)
[
Daniel Tomlinson
](
https://github.com/dantoml
)
[
#5250
](
https://github.com/CocoaPods/CocoaPods/issues/5250
)
[
#5250
](
https://github.com/CocoaPods/CocoaPods/issues/5250
)
*
Ensure attempting to print a path in the error report doesn't itself error.
[
Samuel Giddins
](
https://github.com/
)
[
#5541
](
https://github.com/CocoaPods/CocoaPods/issues/5541
)
## 1.0.1 (2016-06-02)
## 1.0.1 (2016-06-02)
...
...
lib/cocoapods/user_interface.rb
View file @
9fd24443
...
@@ -184,7 +184,11 @@ module Pod
...
@@ -184,7 +184,11 @@ module Pod
if
pathname
if
pathname
from_path
=
config
.
podfile_path
.
dirname
if
config
.
podfile_path
from_path
=
config
.
podfile_path
.
dirname
if
config
.
podfile_path
from_path
||=
Pathname
.
pwd
from_path
||=
Pathname
.
pwd
path
=
Pathname
(
pathname
).
relative_path_from
(
from_path
)
path
=
begin
Pathname
(
pathname
).
relative_path_from
(
from_path
)
rescue
pathname
end
"`
#{
path
}
`"
"`
#{
path
}
`"
else
else
''
''
...
...
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