Repo: use verifyId(), isExpired() from libdnf

Author: jrohel

dnf/base.py

@@ -283,7 +283,7 @@ def _setup_modules(self):
 
     def _store_persistent_data(self):
         if self._repo_persistor and not self.conf.cacheonly:
-            expired = [r.id for r in self.repos.iter_enabled() if r._md_expired]
+            expired = [r.id for r in self.repos.iter_enabled() if r._repo.isExpired()]
             self._repo_persistor.expired_to_add.update(expired)
             self._repo_persistor.save()
 

dnf/repo.py

@@ -71,8 +71,8 @@
 def repo_id_invalid(repo_id):
     # :api
     """Return index of an invalid character in the repo ID (if present)."""
-    invalids = (i for i, c in enumerate(repo_id) if c not in _REPOID_CHARS)
-    return dnf.util.first(invalids)
+    first_invalid = cfg.Repo.verifyId(repo_id)
+    return None if first_invalid < 0 else first_invalid
 
 def _pkg2payload(pkg, progress, *factories):
     for fn in factories:
@@ -446,11 +446,6 @@ def repofile(self):
     def repofile(self, value):
         self._repo.setRepoFilePath(value)
 
-    @property
-    def _md_expired(self):
-        """Return whether the cached metadata is expired."""
-        return self._repo.expired()
-
     @property
     def pkgdir(self):
         # :api