diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-11 12:09:45 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-11 13:26:28 +0100 |
| commit | ec7257ff2c91adcd67ea38b8ca2c29965cbb8241 (patch) | |
| tree | 4765a2eea20f6578bfa3511947c75fb36f444ce3 | |
| parent | 0739a514da24dde1177bdce4fc0afa692549a7d7 (diff) | |
| download | morph-ec7257ff2c91adcd67ea38b8ca2c29965cbb8241.tar.gz | |
Pylint fixes
| -rw-r--r-- | import/main.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/import/main.py b/import/main.py index a9cd4fef..02adeaef 100644 --- a/import/main.py +++ b/import/main.py @@ -26,7 +26,6 @@ import copy import json import logging import os -import sys import time from logging import debug @@ -561,17 +560,20 @@ class BaserockImportApplication(cliapp.Application): def find_or_create_chunk_morph(self, morph_set, goal_name, kind, name, version, source_repo, repo_url, named_ref): - morphology_filename = 'strata/%s/%s-%s.morph' % (goal_name, name, version) + morphology_filename = 'strata/%s/%s-%s.morph' % ( + goal_name, name, version) sha1 = source_repo.resolve_ref_to_commit(named_ref) - morphology = morph_set.get_morphology(repo_url, sha1, morphology_filename) + morphology = morph_set.get_morphology( + repo_url, sha1, morphology_filename) if morphology is None: # Existing chunk morphologies loaded from disk don't contain the repo # and ref information. That's stored in the stratum morph. So the # first time we touch a chunk morph we need to set this info. - logging.debug("Didn't find morphology for %s|%s|%s", repo_url, sha1, - morphology_filename) - morphology = morph_set.get_morphology(None, None, morphology_filename) + logging.debug("Didn't find morphology for %s|%s|%s", repo_url, + sha1, morphology_filename) + morphology = morph_set.get_morphology( + None, None, morphology_filename) if morphology is None: logging.debug("Didn't find morphology for None|None|%s", |