X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/e693fbc9c639083e3003b8de0aff71501afddee2..a4cdf3f1f42dcdbbd51b8eb214fbfe8749f9d15f:/python/invirt/builder.py diff --git a/python/invirt/builder.py b/python/invirt/builder.py index b8e9c0b..a89acf2 100644 --- a/python/invirt/builder.py +++ b/python/invirt/builder.py @@ -31,12 +31,12 @@ def getRepo(package): def pocketToGit(pocket): """Map a pocket in the configuration to a git branch.""" - return config.git.pockets[pocket].get('git', pocket) + return getattr(getattr(config.build.pockets, pocket), 'git', pocket) def pocketToApt(pocket): """Map a pocket in the configuration to an apt repo pocket.""" - return config.git.pockets[pocket].get('apt', pocket) + return getattr(getattr(config.build.pockets, pocket), 'apt', pocket) def getGitFile(package, ref, path): @@ -88,7 +88,7 @@ def validateBuild(pocket, package, commit): package_repo = getRepo(package) new_version = getVersion(package, commit) - for p in config.git.pockets: + for p in config.build.pockets: if p == pocket: continue @@ -105,7 +105,7 @@ def validateBuild(pocket, package, commit): 'pocket %s from commit %s' % (new_version, package, p, current_commit)) - if config.git.pockets[pocket].get('allow_backtracking', False): + if config.build.pockets[pocket].get('allow_backtracking', False): branch = pocketToGit(pocket) current_version = getVersion(package, branch) if new_version <= current_version: