X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/705b811db5dd577929aa161b2fb666ff3f4d3abe..5ba520ed8f5b7c6d755cb7fb93a30c9828e7bb51:/invirtibuilder diff --git a/invirtibuilder b/invirtibuilder index 9198549..d152b18 100755 --- a/invirtibuilder +++ b/invirtibuilder @@ -93,13 +93,13 @@ def sanitizeVersion(version): """Sanitize a Debian package version for use as a git tag. This function strips the epoch from the version number and - replaces any tildes with periods.""" - if v.debian_version: + replaces any tildes with underscores.""" + if version.debian_version: v = '%s-%s' % (version.upstream_version, version.debian_version) else: v = version.upstream_version - return v.replace('~', '.') + return v.replace('~', '_') def aptCopy(package, commit, dst_pocket, src_pocket): @@ -152,7 +152,8 @@ def tagSubmodule(pocket, package, commit, principal, version, env): principal)) c.captureOutput( - ['git', 'tag', '-m', tag_msg, commit], + ['git', 'tag', '-m', tag_msg, '--', sanitizeVersion(version), + commit], env=env, cwd=b.getRepo(package))