diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-27 17:17:36 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-27 17:17:36 +0000 |
| commit | 8a4435f71a8a47e9cf3050ad6456cd9949da5958 (patch) | |
| tree | 04fcc00d75ad0e8a8ad3f369688e6c833621c1b4 /morphlib | |
| parent | c5fc68fa232e88ec3e5e40aaec619280554886a9 (diff) | |
| download | morph-8a4435f71a8a47e9cf3050ad6456cd9949da5958.tar.gz | |
Make ./check check for long lines (with excptions); fix long lines
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/buildcontroller.py | 2 | ||||
| -rw-r--r-- | morphlib/builddependencygraph.py | 8 | ||||
| -rw-r--r-- | morphlib/builder.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/morphlib/buildcontroller.py b/morphlib/buildcontroller.py index 091f575f..fdc6c5e0 100644 --- a/morphlib/buildcontroller.py +++ b/morphlib/buildcontroller.py @@ -51,7 +51,7 @@ class BuildController(object): self.workers.add(worker) self.mark_idle(worker) - def wait_for_workers(self, need_idle=False, timeout=0.1): # pragma: no cover + def wait_for_workers(self, need_idle=False,timeout=0.1): # pragma: no cover # first, check if any of the busy workers are finished while all([not x.check_complete(timeout) for x in self.busy_workers]): # wait and repeat if they are all busy and we have no idle workers diff --git a/morphlib/builddependencygraph.py b/morphlib/builddependencygraph.py index 7908c660..b75eab84 100644 --- a/morphlib/builddependencygraph.py +++ b/morphlib/builddependencygraph.py @@ -169,7 +169,8 @@ class BuildDependencyGraph(object): # pragma: no cover chunk = self.get_blob(treeish, filename) chunk.add_parent(stratum) - # store (name -> chunk) association to avoid loading the chunk twice + # store (name -> chunk) association to avoid loading the chunk + # twice name_to_chunk[source['name']] = chunk # read the build-depends information @@ -189,8 +190,9 @@ class BuildDependencyGraph(object): # pragma: no cover dependency = name_to_chunk[depname] chunk.add_dependency(dependency) else: - raise Exception('%s: source %s references %s before it ' - 'is defined' % (stratum.morph.filename, + raise Exception('%s: source %s references %s before ' + 'it is defined' % + (stratum.morph.filename, source['name'], depname)) else: diff --git a/morphlib/builder.py b/morphlib/builder.py index 3a46cf54..9b55e01f 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -491,7 +491,8 @@ class SystemBuilder(BlobBuilder): self.ex.runv(['parted', '-s', image_name, 'mklabel', 'msdos']) self.ex.runv(['parted', '-s', image_name, 'mkpart', 'primary', '0%', '100%']) - self.ex.runv(['parted', '-s', image_name, 'set', '1', 'boot', 'on']) + self.ex.runv(['parted', '-s', image_name, + 'set', '1', 'boot', 'on']) # Install first stage boot loader into MBR. with self.build_watch('install-mbr'): |