Use version as the tag name

diff --git a/debian/changelog b/debian/changelog
index f82da2f..146c06b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 invirt-dev (0.1.4) unstable; urgency=low
 
+  [ Anders Kaseorg ]
   * Make the default build notifications more useful.
 
- -- Anders Kaseorg <andersk@mit.edu>  Thu, 05 Aug 2010 00:46:52 -0400
+  [ Greg Brockman ]
+  * Use version as the tag name
+
+ -- Greg Brockman <gdb@mit.edu>  Thu, 05 Aug 2010 01:43:12 -0400
 
 invirt-dev (0.1.3) unstable; urgency=low
 

diff --git a/invirtibuilder b/invirtibuilder
index 9198549..d152b18 100755 (executable)
--- 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))