Skip to content

C
cocoapods
Commit c4453e45 authored by Kyle Fuller's avatar Kyle Fuller
Browse files
Options

[Intergrator] Fixes incorrect paths used when checking manifest 

Add extra ../ was recently introduced
parent f6983ef0
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 @ c4453e45
......@@ -119,7 +119,7 @@ module Pod
native_target.build_phases.unshift(phase)
phase.name = phase_name
phase.shell_script = <<-EOS.strip_heredoc
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
cat << EOM
error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
......
spec/unit/installer/user_project_integrator/target_integrator_spec.rb
View file @ c4453e45
......@@ -75,7 +75,7 @@ module Pod
target = @target_integrator.send(:native_targets).first
phase = target.shell_script_build_phases.find { |bp| bp.name == 'Check Pods Manifest.lock' }
phase.shell_script.should == <<-EOS.strip_heredoc
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
cat << EOM
error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
......
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