Skip to content

Commit 416a44b

Browse files
committed
Use Repo::isLocal() from libdnf
1 parent f53e765 commit 416a44b

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

dnf/package.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def localPkg(self):
211211
if self._from_cmdline:
212212
return self.location
213213
loc = self.location
214-
if not self.repo._local:
214+
if not self.repo._repo.isLocal():
215215
loc = os.path.basename(loc)
216216
elif self.baseurl and self.baseurl.startswith('file://'):
217217
return os.path.join(self.baseurl, loc.lstrip("/"))[7:]
@@ -251,7 +251,7 @@ def _is_local_pkg(self):
251251
if self.repoid == "@System":
252252
return True
253253
return self._from_cmdline or \
254-
(self.repo._local and (not self.baseurl or self.baseurl.startswith('file://')))
254+
(self.repo._repo.isLocal() and (not self.baseurl or self.baseurl.startswith('file://')))
255255

256256
# yum compatibility method
257257
def returnIdSum(self):

dnf/repo.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -446,14 +446,6 @@ def repofile(self):
446446
def repofile(self, value):
447447
self._repo.setRepoFilePath(value)
448448

449-
@property
450-
def _local(self):
451-
if self.metalink or self.mirrorlist:
452-
return False
453-
if self.baseurl[0].startswith('file://'):
454-
return True
455-
return False
456-
457449
@property
458450
def _md_expired(self):
459451
"""Return whether the cached metadata is expired."""
@@ -462,7 +454,7 @@ def _md_expired(self):
462454
@property
463455
def pkgdir(self):
464456
# :api
465-
if self._local:
457+
if self._repo.isLocal():
466458
return dnf.util.strip_prefix(self.baseurl[0], 'file://')
467459
if self._pkgdir is not None:
468460
return self._pkgdir

0 commit comments

Comments
 (0)