|
 |
eb5f31 |
commit 36a49290d73951bd92dd0b2db877d11db2a3276f
|
|
|
eb5f31 |
Author: Michal Domonkos <mdomonko@redhat.com>
|
|
|
eb5f31 |
Date: Mon Apr 25 17:09:25 2016 +0200
|
|
|
eb5f31 |
|
|
|
eb5f31 |
Add metadata_expire_filter to repoinfo output. BZ 1321651
|
|
|
eb5f31 |
|
|
|
eb5f31 |
diff --git a/yumcommands.py b/yumcommands.py
|
|
|
eb5f31 |
index 7118f3b..618ae5c 100644
|
|
|
eb5f31 |
--- a/yumcommands.py
|
|
|
eb5f31 |
+++ b/yumcommands.py
|
|
|
eb5f31 |
@@ -2325,7 +2325,10 @@ class RepoListCommand(YumCommand):
|
|
|
eb5f31 |
num = _num2ui_num(repo.metadata_expire)
|
|
|
eb5f31 |
num = _("%s second(s) (last: %s)") % (num, last)
|
|
|
eb5f31 |
|
|
|
eb5f31 |
- out += [base.fmtKeyValFill(_("Repo-expire : "), num)]
|
|
|
eb5f31 |
+ out += [base.fmtKeyValFill(_("Repo-expire : "), num),
|
|
|
eb5f31 |
+ base.fmtKeyValFill(_(" Filter : "),
|
|
|
eb5f31 |
+ repo.metadata_expire_filter),
|
|
|
eb5f31 |
+ ]
|
|
|
eb5f31 |
|
|
|
eb5f31 |
if repo.exclude:
|
|
|
eb5f31 |
out += [base.fmtKeyValFill(_("Repo-exclude : "),
|
|
|
eb5f31 |
|
|
|
eb5f31 |
commit e2db41de3d19cbd8c94a1c3824b541dbd4b706bb
|
|
|
eb5f31 |
Author: Michal Domonkos <mdomonko@redhat.com>
|
|
|
eb5f31 |
Date: Mon Apr 25 15:12:23 2016 +0200
|
|
|
eb5f31 |
|
|
|
eb5f31 |
docs: add a freshness note for metadata_expire_filter
|
|
|
eb5f31 |
|
|
|
eb5f31 |
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
|
|
|
eb5f31 |
index f823c6f..efc6765 100644
|
|
|
eb5f31 |
--- a/docs/yum.conf.5
|
|
|
eb5f31 |
+++ b/docs/yum.conf.5
|
|
|
eb5f31 |
@@ -646,7 +646,12 @@ Eg. yum list yum
|
|
|
eb5f31 |
`read-only:future' - Commands that are likely to result in running other
|
|
|
eb5f31 |
commands which will require the latest metadata. Eg. yum check-update
|
|
|
eb5f31 |
|
|
|
eb5f31 |
-Note that this option does not override "yum clean expire-cache".
|
|
|
eb5f31 |
+Note that this option requires that all the enabled repositories be roughly the
|
|
|
eb5f31 |
+same freshness (meaning the cache age difference from one another is at most 5
|
|
|
eb5f31 |
+days). Failing that, metadata_expire will always be obeyed, just like with
|
|
|
eb5f31 |
+`never'.
|
|
|
eb5f31 |
+
|
|
|
eb5f31 |
+Also note that this option does not override "yum clean expire-cache".
|
|
|
eb5f31 |
|
|
|
eb5f31 |
.IP
|
|
|
eb5f31 |
\fBmirrorlist_expire \fR
|