diff options
author | 2014-05-23 15:42:32 -0400 | |
---|---|---|
committer | 2014-06-12 17:11:49 -0400 | |
commit | a6d4076a37a3829553b4f31bd28d6b0c35366ac5 (patch) | |
tree | 96d8cf6db4865697e190f5765266d8e5d2c45f3a /layman/api.py | |
parent | db.py: Incorporates RepoConfManager class (diff) | |
download | layman-a6d4076a37a3829553b4f31bd28d6b0c35366ac5.tar.gz layman-a6d4076a37a3829553b4f31bd28d6b0c35366ac5.tar.bz2 layman-a6d4076a37a3829553b4f31bd28d6b0c35366ac5.zip |
utils.py: adds verify_overlay_src() function
api.py: incorporates the verify_overlay_src() function
Diffstat (limited to 'layman/api.py')
-rwxr-xr-x | layman/api.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/layman/api.py b/layman/api.py index 1334c29..9af9b31 100755 --- a/layman/api.py +++ b/layman/api.py @@ -16,15 +16,17 @@ from __future__ import unicode_literals from __future__ import print_function -import os, sys +import os +import sys -from layman.config import BareConfig -from layman.dbbase import UnknownOverlayException, UnknownOverlayMessage -from layman.db import DB -from layman.remotedb import RemoteDB +from layman.config import BareConfig +from layman.dbbase import UnknownOverlayException, UnknownOverlayMessage +from layman.db import DB +from layman.remotedb import RemoteDB from layman.overlays.source import require_supported #from layman.utils import path, delete_empty_directory -from layman.compatibility import encode +from layman.compatibility import encode +from layman.utils import verify_overlay_src if sys.hexversion >= 0x30200f0: STR = str @@ -336,8 +338,10 @@ class LaymanAPI(object): else: self.output.debug("API.sync(); else: self._get_remote_db().select(ovl)", 5) current_src = odb.sources[0].src - available_srcs = set(e.src for e in ordb.sources) - if ordb and odb and not current_src in available_srcs: + (available_srcs, valid) = verify_overlay_src(current_src, + set(e.src for e in ordb.sources)) + + if ordb and odb and not valid: if len(available_srcs) == 1: plural = '' candidates = ' %s' % tuple(available_srcs)[0] |