diff options
| -rw-r--r-- | kbas/__init__.py | 1 | ||||
| -rwxr-xr-x | kbas/__main__.py | 3 | ||||
| -rwxr-xr-x | ybd/__main__.py | 2 | ||||
| -rw-r--r-- | ybd/app.py | 3 | ||||
| -rw-r--r-- | ybd/assembly.py | 5 | ||||
| -rw-r--r-- | ybd/cache.py | 12 | ||||
| -rw-r--r-- | ybd/defaults.py | 6 | ||||
| -rw-r--r-- | ybd/definitions.py | 2 | ||||
| -rw-r--r-- | ybd/repos.py | 3 |
9 files changed, 21 insertions, 16 deletions
diff --git a/kbas/__init__.py b/kbas/__init__.py index 8b13789..e69de29 100644 --- a/kbas/__init__.py +++ b/kbas/__init__.py @@ -1 +0,0 @@ - diff --git a/kbas/__main__.py b/kbas/__main__.py index e486bff..e8b49b0 100755 --- a/kbas/__main__.py +++ b/kbas/__main__.py @@ -131,7 +131,8 @@ class KeyedBinaryArtifactServer(object): app.log(this, 'ERROR: Problem unpacking', artifact) raise shutil.rmtree(unpackdir) - os.rename(tmpdir, os.path.join(app.config['artifact-dir'], cache_id)) + os.rename(tmpdir, os.path.join(app.config['artifact-dir'], + cache_id)) response.status = 201 # success! return except: diff --git a/ybd/__main__.py b/ybd/__main__.py index f1851e7..4c727cb 100755 --- a/ybd/__main__.py +++ b/ybd/__main__.py @@ -71,6 +71,6 @@ with app.timer('TOTAL'): app.log(target, 'Exiting: uncaught exception') os._exit(1) - if target.get('kind') == 'cluster' and app.config.get('fork') == None: + if target.get('kind') == 'cluster' and app.config.get('fork') is None: with app.timer(target, 'cluster deployment'): deploy(defs, target) @@ -205,7 +205,7 @@ def cull(artifact_dir): else: os.remove(path) deleted += 1 - if free < config.get('min-gigabytes', 10): + if free < config.get('min-gigabytes', 10): log('SETUP', 'ERROR: %s is less than min-gigabytes' % free) @@ -243,6 +243,7 @@ def timer(this, message=''): text = '' if message == '' else ' for ' + message log(this, 'Elapsed time' + text, elapsed(starttime)) + def elapsed(starttime): td = datetime.datetime.now() - starttime hours, remainder = divmod(int(td.total_seconds()), 60*60) diff --git a/ybd/assembly.py b/ybd/assembly.py index b5f0b2a..7c8feaf 100644 --- a/ybd/assembly.py +++ b/ybd/assembly.py @@ -26,7 +26,8 @@ from cache import cache, cache_key, get_cache, get_remote import repos import sandbox from shutil import copyfile -import time, datetime +import time +import datetime class RetryException(Exception): @@ -133,7 +134,7 @@ def preinstall(defs, component, it): it = defs.get(dep) if (it.get('build-mode', 'staging') == dependency.get('build-mode', 'staging')): - preinstall(defs, component, it) + preinstall(defs, component, it) contents = dependency.get('contents', []) random.shuffle(contents) diff --git a/ybd/cache.py b/ybd/cache.py index ba5afab..c1fa253 100644 --- a/ybd/cache.py +++ b/ybd/cache.py @@ -28,7 +28,8 @@ import repos import utils import tempfile -cache_list={} +cache_list = {} + def cache_key(defs, this): definition = defs.get(this) @@ -42,7 +43,7 @@ def cache_key(defs, this): return definition['cache'] if definition.get('arch', app.config['arch']) != app.config['arch']: - return False + return False definition['cache'] = 'calculating' @@ -84,9 +85,10 @@ def cache_key(defs, this): if app.config.get('cache-log'): cache_list[definition.get('name')] = definition.get('cache') if definition.get('kind') == 'system': - with open(app.config.get('cache-log'),'w') as f: - f.write(json.dumps(cache_list,indent=4)) - app.log('cache-log', 'cache logged to',app.config.get('cache-log')) + with open(app.config.get('cache-log'), 'w') as f: + f.write(json.dumps(cache_list, indent=4)) + app.log('cache-log', 'cache logged to', + app.config.get('cache-log')) return definition['cache'] diff --git a/ybd/defaults.py b/ybd/defaults.py index c50e5b8..963971b 100644 --- a/ybd/defaults.py +++ b/ybd/defaults.py @@ -44,12 +44,12 @@ class Defaults(object): ybd_defaults = self._load(ybd_defaults_file, ignore_errors=True) defaults = self._load(defaults_file, ignore_errors=True) - if defaults == None: + if defaults is None: return ybd_defaults for index in ybd_defaults: - if defaults.get(index) == None or defaults.get(index) == {}: - defaults[index] = ybd_defaults[index] + if defaults.get(index) is None or defaults.get(index) == {}: + defaults[index] = ybd_defaults[index] return defaults diff --git a/ybd/definitions.py b/ybd/definitions.py index 4e4dc95..f5cf180 100644 --- a/ybd/definitions.py +++ b/ybd/definitions.py @@ -61,7 +61,7 @@ class Definitions(object): try: this = self._definitions[path] if this.get('ref') and self._trees.get(path): - if this['ref'] == self._trees.get(path)[0]: + if this['ref'] == self._trees.get(path)[0]: this['tree'] = self._trees.get(path)[1] except: app.log('DEFINITIONS', 'WARNING: problem with .trees file') diff --git a/ybd/repos.py b/ybd/repos.py index 156d8e4..81f6bc4 100644 --- a/ybd/repos.py +++ b/ybd/repos.py @@ -80,7 +80,7 @@ def get_tree(this): if this['repo'].startswith('file://') or this['repo'].startswith('/'): gitdir = this['repo'].replace('file://', '') if not os.path.isdir(gitdir): - app.exit(this, 'ERROR: git repo not found:', this['repo'] ) + app.exit(this, 'ERROR: git repo not found:', this['repo']) if not os.path.exists(gitdir): try: @@ -148,6 +148,7 @@ def mirror(name, repo): except: pass + def fetch(repo): with app.chdir(repo), open(os.devnull, "w") as fnull: call(['git', 'fetch', 'origin'], stdout=fnull, stderr=fnull) |