[PATCH] Define valid tar formats as gz/bz2. Error clearly when there aren't enough arguments Make metafile argument optional and default to args[0]+ '.meta'

--- scripts/assemble-stratum | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/assemble-stratum b/scripts/assemble-stratum index 9addd36..e165e89 100755 --- a/scripts/assemble-stratum +++ b/scripts/assemble-stratum @@ -31,14 +31,17 @@ class AssembleStratum(cliapp.Application): self.settings.string(['cachedir'], 'Where the cache basedir is') self.settings.string(['tarformat'], - 'What format to write tar to', + 'What format to write tar to (gz, bz2)', default='') def process_args(self, args): + if len(args) < 2: + raise cliapp.AppException('Need a stratum file and an output file') + chunklist = json.load(open(args[0])) tarformat = 'w' if self.settings['tarformat'] != "": - tarformat += self.settings['tarformat'] + tarformat += ':%s' % self.settings['tarformat'] outfile = tarfile.open(args[1], tarformat) # concatenate chunk tarballs for chunk in chunklist: @@ -50,10 +53,15 @@ class AssembleStratum(cliapp.Application): else: outfile.addfile(tarinfo) chunktar.close() + # add the stratum's metadata + metapath = args[0] + if len(args) > 2: + metapath = args[2] + metapath += '.meta' if os.path.exists(args[0] + '.meta'): outfile.add(args[0] + '.meta', - os.path.join('baserock', '%s.meta' % args[2])) + os.path.join('baserock', metapath)) outfile.close() AssembleStratum().run() -- 1.7.9.5