_LOG_DIR = '/var/log/invirt/builds'
_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."""
"""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."""
ensureValidPackage(package)
package_repo = getRepo(package)
new_version = getVersion(package, commit)
+ new_distro = pocketToDistro(pocket)
ret = True
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)],
- cwd=package_repo):
+ 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))