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
8ee37c39
Commit
8ee37c39
authored
Oct 16, 2016
by
Danielle Tomlinson
Committed by
GitHub
Oct 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6040 from UkuLoskit/fix_6032
Exit with non-zero exit status if pod repo update fails
parents
2221f4f3
c1fbc6d0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
CHANGELOG.md
CHANGELOG.md
+5
-0
sources_manager.rb
lib/cocoapods/sources_manager.rb
+1
-1
sources_manager_spec.rb
spec/unit/sources_manager_spec.rb
+2
-3
No files found.
CHANGELOG.md
View file @
8ee37c39
...
...
@@ -16,6 +16,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#6042
](
https://github.com/CocoaPods/CocoaPods/pull/6042
)
*
Exit with non-zero exit status if pod repo update fails
[
Uku Loskit
](
https://github.com/UkuLoskit
)
[
#6037
](
https://github.com/CocoaPods/CocoaPods/issues/6037
)
##### Bug Fixes
*
None.
...
...
lib/cocoapods/sources_manager.rb
View file @
8ee37c39
...
...
@@ -107,7 +107,7 @@ module Pod
git!
([
'-C'
,
repo
,
'pull'
,
'--ff-only'
])
end
rescue
UI
.
warn
'CocoaPods was not able to update the '
\
raise
Informative
,
'CocoaPods was not able to update the '
\
"`
#{
name
}
` repo. If this is an unexpected issue "
\
'and persists you can inspect it running '
\
'`pod repo update --verbose`'
...
...
spec/unit/sources_manager_spec.rb
View file @
8ee37c39
...
...
@@ -135,9 +135,8 @@ fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
EOS
@sources_manager
.
expects
(
:update_search_index_if_needed_in_background
).
with
({}).
returns
(
nil
)
@sources_manager
.
update
(
test_repo_path
.
basename
.
to_s
,
true
)
UI
.
warnings
.
should
.
include
(
'not able to update the `master` repo'
)
e
=
lambda
{
@sources_manager
.
update
(
test_repo_path
.
basename
.
to_s
,
true
)
}.
should
.
raise
Pod
::
Informative
e
.
message
.
should
.
include
(
'not able to update the `master` repo'
)
end
it
'informs the user if there is an update for CocoaPods'
do
...
...
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