Skip to content

Commit 99fbdc7

Browse files
committed
vmupdate: expire cache + correct option name
expiring cache enforces re-downloading metadata skip_unavailable -> skip_if_unavailable skip_unavailable: skips unavailable packages skip_if_unavailable: skips unavailable repos
1 parent adc8d45 commit 99fbdc7

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

vmupdate/agent/source/dnf/dnf5_api.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# USA.
2222

2323
import subprocess
24+
import os
2425

2526
import libdnf5
2627
from libdnf5.repo import DownloadCallbacks
@@ -57,11 +58,14 @@ def refresh(self, hard_fail: bool) -> ProcessResult:
5758
:param hard_fail: raise error if some repo is unavailable
5859
:return: (exit_code, stdout, stderr)
5960
"""
60-
self.config.skip_unavailable = not hard_fail
61+
self.config.skip_if_unavailable = not hard_fail
6162

6263
result = ProcessResult()
6364
try:
6465
self.log.debug("Refreshing available packages...")
66+
67+
result += self.expire_cache()
68+
6569
repo_sack = self.base.get_repo_sack()
6670
repo_sack.create_repos_from_system_configuration()
6771
repo_sack.load_repos()

vmupdate/agent/source/dnf/dnf_cli.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ def refresh(self, hard_fail: bool) -> ProcessResult:
4848
:param hard_fail: raise error if some repo is unavailable
4949
:return: (exit_code, stdout, stderr)
5050
"""
51-
cmd = [self.package_manager,
52-
"-q",
53-
"clean",
54-
"expire-cache"]
55-
result = self.run_cmd(cmd)
51+
result = self.expire_cache()
5652

5753
cmd = [self.package_manager,
5854
"-q",
@@ -67,6 +63,17 @@ def refresh(self, hard_fail: bool) -> ProcessResult:
6763

6864
return result
6965

66+
def expire_cache(self) -> ProcessResult:
67+
"""
68+
Use package manager to expire cache.
69+
"""
70+
cmd = [self.package_manager,
71+
"-q",
72+
"clean",
73+
"expire-cache"]
74+
result = self.run_cmd(cmd)
75+
return result
76+
7077
def get_packages(self):
7178
"""
7279
Use rpm to return the installed packages and their versions.

0 commit comments

Comments
 (0)