diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2017-02-02 09:11:23 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2017-02-02 09:11:23 -0800 |
| commit | 37415aff57a2a06ae425c5cc0abab3eedf9ec1b4 (patch) | |
| tree | 32865a143249ebc288b079afce1e7b7fc4ce179c | |
| parent | layman/cli.py: Typo fix (diff) | |
| parent | api.py: Moves instantiation of rdb to above for-loop (diff) | |
| download | layman-37415aff57a2a06ae425c5cc0abab3eedf9ec1b4.tar.gz layman-37415aff57a2a06ae425c5cc0abab3eedf9ec1b4.tar.bz2 layman-37415aff57a2a06ae425c5cc0abab3eedf9ec1b4.zip | |
Merge branch 'master' of git+ssh://git.gentoo.org/proj/layman
| -rwxr-xr-x | layman/api.py | 3 | ||||
| -rw-r--r-- | layman/argsparser.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/layman/api.py b/layman/api.py index 2c46bb7..73fb72a 100755 --- a/layman/api.py +++ b/layman/api.py @@ -384,6 +384,7 @@ class LaymanAPI(object): success = [] repos = self._check_repo_type(repos, "sync") db = self._get_installed_db() + rdb = self._get_remote_db() self.output.debug("API.sync(); starting ovl loop", 5) for ovl in repos: @@ -406,7 +407,7 @@ class LaymanAPI(object): try: self.output.debug("API.sync(); try: self._get_remote_db().select(ovl)", 5) - ordb = self._get_remote_db().select(ovl) + ordb = rdb.select(ovl) except UnknownOverlayException: message = 'Overlay "%(repo)s" could not be found in the remote '\ 'lists.\nPlease check if it has been renamed and '\ diff --git a/layman/argsparser.py b/layman/argsparser.py index f3cc8fa..272ac47 100644 --- a/layman/argsparser.py +++ b/layman/argsparser.py @@ -193,7 +193,7 @@ class ArgsParser(BareConfig): action = 'store', default = self.defaults['overlay_defs'], # Force interpolation (to prevent argparse tracebacks) - help = 'Path to aditional overlay.xml files [default: ' + help = 'Path to additional overlay.xml files [default: ' '%s].' % (self.defaults['overlay_defs'] %self.defaults)) path_opts.add_argument('-z', |