Skip to content

C
cocoapods
Commit fe0ea001 authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

Merge pull request #973 from corristo/master 

Added hint about updating CocoaPods installation when Podfile.lock and Manifest.lock are not in sync
parents 9705543e eb4d72de
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file @ fe0ea001
...@@ -152,7 +152,7 @@ module Pod ...@@ -152,7 +152,7 @@ module Pod
diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
cat << EOM cat << EOM
error: The sandbox is not in sync with the Podfile.lock. Run 'pod install'. error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
EOM EOM
exit 1 exit 1
fi fi
......
spec/unit/installer/user_project_integrator/target_integrator_spec.rb
View file @ fe0ea001
...@@ -95,7 +95,7 @@ module Pod ...@@ -95,7 +95,7 @@ module Pod
diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
cat << EOM cat << EOM
error: The sandbox is not in sync with the Podfile.lock. Run 'pod install'. error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
EOM EOM
exit 1 exit 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment