Skip to content

Commit 1a549a9

Browse files
committed
fixup
Signed-off-by: Deli Zhang <deli.zhang@citrix.com>
1 parent 2862885 commit 1a549a9

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

ocaml/xapi/repository.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ let sync ~__context ~self ~token ~token_id ~username ~password =
293293
* will always write_initial_yum_config every time before syncing repo,
294294
* this should be ok.
295295
*)
296-
if Pkgs.manager = Yum then
297-
write_initial_yum_config ~binary_url
298-
else
299-
Unixext.unlink_safe !Xapi_globs.dnf_repo_config_file
300-
296+
match Pkgs.manager with
297+
| Yum ->
298+
write_initial_yum_config ~binary_url
299+
| Dnf ->
300+
Unixext.unlink_safe !Xapi_globs.dnf_repo_config_file
301301
) ;
302302
(* The custom yum-utils will fully download repository metadata including
303303
* the repo gpg signature.

ocaml/xapi/xapi_globs.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,8 @@ let pvsproxy_close_cache_vdi = ref "/opt/citrix/pvsproxy/close-cache-vdi.sh"
972972

973973
let yum_repos_config_dir = ref "/etc/yum.repos.d"
974974

975-
let dnf_repo_config_file = ref "/etc/dnf/repos.override.d/99-config_manager.repo"
975+
let dnf_repo_config_file =
976+
ref "/etc/dnf/repos.override.d/99-config_manager.repo"
976977

977978
let remote_repository_prefix = ref "remote"
978979

0 commit comments

Comments
 (0)