Skip to content

Commit

Permalink
Merge pull request #4935 from kit-ty-kate/more-last-update-check
Browse files Browse the repository at this point in the history
Check whether the repository might need updating more often
  • Loading branch information
rjbou authored Dec 10, 2021
2 parents 3d58d5c + 5ee87dc commit 5305e15
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ users)
* Refactored, fixed, improved and optimised the z3 solver backend [#4878 @altgr]

## Client
*
* Check whether the repository might need updating more often [#4935 @kit-ty-kate]

## Internal
* Add license and lowerbounds to opam files [#4714 @kit-ty-kate]
Expand Down
1 change: 0 additions & 1 deletion src/client/opamClient.ml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ let get_installed_atoms t atoms =
(* Check atoms for pinned packages, and update them. Returns the state that
may have been reloaded if there were changes *)
let update_dev_packages_t ?(only_installed=false) atoms t =
OpamRepositoryState.check_last_update ();
if OpamClientConfig.(!r.skip_dev_update) then t else
let working_dir = OpamClientConfig.(!r.working_dir || !r.inplace_build) in
let to_update =
Expand Down
1 change: 1 addition & 0 deletions src/client/opamSolution.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,7 @@ let resolve t action ~orphans ?reinstall ~requested request =
(`A (List.map (fun s -> `String s) (Array.to_list Sys.argv)));
OpamJson.append "switch" (OpamSwitch.to_json t.switch)
);
OpamRepositoryState.check_last_update ();
let universe =
OpamSwitchState.universe t ~requested ?reinstall action
in
Expand Down
1 change: 0 additions & 1 deletion src/client/opamSwitchCommand.ml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ let install_compiler
OpamEnv.check_and_print_env_warning t);
t
end else
let () = OpamRepositoryState.check_last_update () in
let atoms = OpamFormula.atoms invariant in
let names_of_atoms at = OpamPackage.Name.Set.of_list (List.map fst at) in
let comp_roots = names_of_atoms atoms in
Expand Down

0 comments on commit 5305e15

Please sign in to comment.