summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-06-14 16:04:22 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-06-14 16:04:22 +0000
commitd9c8acc730ecc7ea203fb0950a7f461f2822ef4f (patch)
tree520deaa521f5d3ea71f591e273f4e27a802c7788 /scripts
parente5ce2f18d589b595682044589f4f5527e5b1bee6 (diff)
downloadmorph-d9c8acc730ecc7ea203fb0950a7f461f2822ef4f.tar.gz
fix tabs and line widths so ./check passes
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/assemble-stratum12
-rwxr-xr-xscripts/list-overlaps10
2 files changed, 11 insertions, 11 deletions
diff --git a/scripts/assemble-stratum b/scripts/assemble-stratum
index 1fe9bd12..ef81c7f6 100755
--- a/scripts/assemble-stratum
+++ b/scripts/assemble-stratum
@@ -35,15 +35,15 @@ class AssembleStratum(cliapp.Application):
def process_args(self, args):
chunklist = json.load(open(args[0]))
- tarformat = 'w'
+ tarformat = 'w'
if self.settings['tarformat'] != "":
tarformat += self.settings['tarformat']
- outfile = tarfile.open(args[1], tarformat)
- # concatenate chunk tarballs
+ outfile = tarfile.open(args[1], tarformat)
+ # concatenate chunk tarballs
for chunk in chunklist:
path = os.path.join(self.settings['cachedir'], 'artifacts', chunk)
- chunktar = tarfile.open(path, mode='r:*')
- for tarinfo in chunktar:
+ chunktar = tarfile.open(path, mode='r:*')
+ for tarinfo in chunktar:
if tarinfo.isfile():
outfile.addfile(tarinfo, chunktar.extractfile(tarinfo))
else:
@@ -53,6 +53,6 @@ class AssembleStratum(cliapp.Application):
if os.path.exists(args[0] + '.meta'):
outfile.add(args[0] + '.meta',
os.path.join('baserock', '%s.meta' % args[2]))
- outfile.close()
+ outfile.close()
AssembleStratum().run()
diff --git a/scripts/list-overlaps b/scripts/list-overlaps
index 5bd96832..3d92d4ad 100755
--- a/scripts/list-overlaps
+++ b/scripts/list-overlaps
@@ -27,18 +27,18 @@ class ListOverlaps(cliapp.Application):
@staticmethod
def _load_overlap(filename):
data = json.load(open(filename))
- overlaps = dict((frozenset(pair[0]), set(pair[1])) for pair in data)
- return overlaps
+ overlaps = dict((frozenset(pair[0]), set(pair[1])) for pair in data)
+ return overlaps
def cmd_groups(self, args):
overlaps = ListOverlaps._load_overlap(args[0])
- for group in overlaps:
+ for group in overlaps:
print(' '.join(sorted(group)))
def cmd_list_files(self, args):
overlaps = self._load_overlap(args[0])
- group = frozenset(args[1:])
- for filename in overlaps[group]:
+ group = frozenset(args[1:])
+ for filename in overlaps[group]:
print filename
ListOverlaps().run()