X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/a75b7dcc80d59c47937221b7bdecbebda7b62fab..046e50706c20fe18f380eb37eb72836a9f051450:/invirtibuilder diff --git a/invirtibuilder b/invirtibuilder index 1a77e74..4849bee 100755 --- a/invirtibuilder +++ b/invirtibuilder @@ -20,12 +20,14 @@ Each queue file contains a file of the form pocket package hash principal where pocket is one of the pockets globally configured in -git.pockets. For instance, the pockets in XVM are "prod" and "dev". +build.pockets. For instance, the pockets in XVM are "prod" and "dev". principal is the Kerberos principal that requested the build. """ +from __future__ import with_statement + import contextlib import os import re @@ -135,13 +137,13 @@ def tagSubmodule(pocket, package, ref, principal): I'm sure that long description gives you great confidence in teh legitimacy of my reasoning. """ - if config.git.pockets[pocket].get('allow_backtracking', False): + if config.build.pockets[pocket].get('allow_backtracking', False): env = dict(os.environ) branch = b.pocketToGit(pocket) version = b.getVersion(package, ref) - env['GIT_COMMITTER_NAME'] = config.git.tagger.name - env['GIT_COMMITTER_EMAIL'] = config.git.tagger.email + env['GIT_COMMITTER_NAME'] = config.build.tagger.name + env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email tag_msg = ('Tag %s of %s\n\n' 'Requested by %s' % (version.full_version, package, @@ -180,7 +182,7 @@ def updateSuperrepo(pocket, package, commit, principal): Note that there's no locking issue here, because we disallow all pushes to the superrepo. """ - superrepo = os.path.join(b._REPO_DIR, 'packages.git') + superrepo = os.path.join(b._REPO_DIR, 'invirt/packages.git') branch = b.pocketToGit(pocket) tree = c.captureOutput(['git', 'ls-tree', branch], cwd=superrepo)