X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/19687e3e1589b1c644ae4ba4b82cba3646fafd88..b9ae1aa7c56957f58ce1a16cdec108ffa3533b1b:/invirtibuilder diff --git a/invirtibuilder b/invirtibuilder index 9260b1e..c955dfd 100755 --- a/invirtibuilder +++ b/invirtibuilder @@ -56,6 +56,9 @@ def logAndRun(cmd, *args, **kwargs): del kwargs['stdout'] kwargs['stderr'] = logfile logfile.write('---> Ran %s\n' % (cmd, )) + if 'stdin_str' in kwargs: + logfile.write('STDIN:\n') + logfile.write(kwargs['stdin_str']) logfile.write('STDERR:\n') output = c.captureOutput(cmd, *args, **kwargs) logfile.write('STDOUT:\n') @@ -235,7 +238,8 @@ def updateSuperproject(pocket, package, commit, principal, version, env): \turl = ../packages/%s.git """ % (package, package, package) gitmodules_hash = logAndRun(['git', 'hash-object', '-w', '--stdin'], - cwd=superproject).strip() + cwd=superproject, + stdin_str=gitmodules).strip() tree_items[package] = "100644 blob "+gitmodules_hash new_tree = "\n".join("%s\t%s" % (v, k) for (k, v) in tree_items.iteritems())