import os
+import subprocess
from debian_bundle import changelog
-from debian_bundle import deb822
import invirt.common as c
from invirt.config import structs as config
_QUEUE_DIR = '/var/lib/invirt-dev/queue'
_REPO_DIR = '/srv/git'
_LOG_DIR = '/var/log/invirt/builds'
-_HOOKS_DIR = '/usr/share/invirt-dev/build.d'
+_HOOKS_DIR = '/usr/share/invirt-dev/build-hooks'
+
+_DEFAULT_DISTRIBUTION = 'hardy'
class InvalidBuild(ValueError):
pass
+_DISTRO_TO_SUFFIX = {
+ 'etch': '~debian4.0',
+ 'lenny': '~debian5.0',
+ 'squeeze': '~debian6.0',
+
+ 'hardy': '~ubuntu8.04',
+ 'lucid': '~ubuntu10.04',
+ 'maverick': '~ubuntu10.10',
+ 'natty': '~ubuntu11.04',
+ 'oneiric': '~ubuntu11.10',
+ 'precise': '~ubuntu12.04',
+ }
+
+def distroToSuffix(distro):
+ return _DISTRO_TO_SUFFIX.get(distro, '~'+distro)
def getRepo(package):
"""Return the path to the git repo for a given package."""
return os.path.join(_REPO_DIR, 'invirt/packages', '%s.git' % package)
-def ensureValidRepo(package):
+def ensureValidPackage(package):
"""Perform some basic sanity checks that the requested repo is in a
subdirectory of _REPO_DIR/invirt/packages. This prevents weirdness
such as submitting a package like '../prod/...git'. Also ensures that
elif not os.path.exists(repo):
raise InvalidBuild('Nonexisting package %s' % package)
+def canonicalize_commit(package, commit, shorten=False):
+ if shorten:
+ flags = ['--short']
+ else:
+ flags = []
+ return c.captureOutput(['git', 'rev-parse'] + flags + [commit],
+ cwd=getRepo(package)).strip()
+
def pocketToGit(pocket):
"""Map a pocket in the configuration to a git branch."""
return getattr(getattr(config.build.pockets, pocket), 'git', pocket)
"""Map a pocket in the configuration to an apt repo pocket."""
return getattr(getattr(config.build.pockets, pocket), 'apt', pocket)
+def pocketToDistro(pocket):
+ """Map a pocket in the configuration to the distro we build for."""
+ return getattr(getattr(config.build.pockets, pocket), 'distro', _DEFAULT_DISTRIBUTION)
def getGitFile(package, ref, path):
"""Return the contents of a path from a git ref in a package."""
"""
return changelog.Changelog(getGitFile(package, ref, 'debian/changelog'))
+def runHook(hook, args=[], stdin_str=None):
+ """Run a named hook."""
+ hook = os.path.join(_HOOKS_DIR, hook)
+ try:
+ c.captureOutput([hook] + args, stdin_str=stdin_str)
+ except OSError:
+ pass
def getVersion(package, ref):
"""Get the version of a given package at a particular ref."""
another pocket, then this function returns that pocket. Otherwise,
it returns True.
"""
- ensureValidRepo(package)
+ ensureValidPackage(package)
package_repo = getRepo(package)
new_version = getVersion(package, commit)
+ new_distro = pocketToDistro(pocket)
ret = True
continue
b = pocketToGit(p)
- current_commit = c.captureOutput(['git', 'rev-parse', b],
- cwd=package_repo).strip()
+ try:
+ current_commit = c.captureOutput(['git', 'rev-parse', b],
+ cwd=package_repo).strip()
+ except subprocess.CalledProcessError:
+ # Guess we haven't created this pocket yet
+ continue
+
current_version = getVersion(package, b)
+ current_distro = pocketToDistro(p)
+
+ # NB: Neither current_version nor new_version will have the
+ # distro-specific prefix.
- if current_version == new_version:
+ if current_version == new_version and current_distro == new_distro:
if current_commit == commit:
ret = p
else:
# Almost by definition, A is a fast-forward of B if B..A is
# empty
- if not c.captureOutput(['git', 'rev-list', '%s..%s' % (commit, branch)]):
+ if c.captureOutput(['git', 'rev-list', '%s..%s' % (commit, branch)],
+ cwd=package_repo):
raise InvalidBuild('New commit %s of %s is not a fast-forward of'
'commit currently in pocket %s' %
(commit, package, pocket))