Commit c290bf9f authored by Fabio Pelosin's avatar Fabio Pelosin

[Install/Update] Forgot to stage two files :-).

parent 33c9710e
...@@ -35,10 +35,10 @@ module Pod ...@@ -35,10 +35,10 @@ module Pod
raise Informative, "No `Podfile.lock' found in the current working directory, run `pod install'." raise Informative, "No `Podfile.lock' found in the current working directory, run `pod install'."
end end
# if @update_repo if @update_repo
# print_title 'Updating Spec Repositories', true print_title 'Updating Spec Repositories', true
# Repo.new(ARGV.new(["update"])).run Repo.new(ARGV.new(["update"])).run
# end end
sandbox = Sandbox.new(config.project_pods_root) sandbox = Sandbox.new(config.project_pods_root)
resolver = Resolver.new(podfile, lockfile, sandbox) resolver = Resolver.new(podfile, lockfile, sandbox)
......
...@@ -68,10 +68,13 @@ module Pod ...@@ -68,10 +68,13 @@ module Pod
end end
end end
lock_dependencies_version unless update_mode
@cached_specs = {} @cached_specs = {}
@targets_and_specs = {} @targets_and_specs = {}
@external_pods = [] @external_pods = []
@dependencies_podfile_incompatible = []
@removed_pods = []
lock_dependencies_version unless update_mode
@podfile.target_definitions.values.each do |target_definition| @podfile.target_definitions.values.each do |target_definition|
puts "\nResolving dependencies for target `#{target_definition.name}' (#{target_definition.platform}):".green if config.verbose? puts "\nResolving dependencies for target `#{target_definition.name}' (#{target_definition.platform}):".green if config.verbose?
...@@ -161,8 +164,6 @@ module Pod ...@@ -161,8 +164,6 @@ module Pod
# #
def lock_dependencies_version def lock_dependencies_version
return unless lockfile return unless lockfile
@dependencies_podfile_incompatible = []
@removed_pods = []
puts "\nFinding updated or removed pods:".green if config.verbose? puts "\nFinding updated or removed pods:".green if config.verbose?
podfile_deps_names = podfile_dependencies.map(&:name) podfile_deps_names = podfile_dependencies.map(&:name)
......
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