Changeset 2544 for trunk

Timestamp:

Nov 22, 2009, 4:07:21 PM (15 years ago)

Author:

broder

Message:

Deal with Debian-native packages correctly when calculating and
formatting version numbers.

File:

• trunk/packages/invirt-dev/invirtibuilder (modified) (2 diffs)

trunk/packages/invirt-dev/invirtibuilder

@@ -71 +71 @@
     """Return the .dsc file that will be generated for this package."""
     v = getVersion(package, ref)
-    return '%s_%s-%s.dsc' % (
+    if v.debian_version:
+        v_str = '%s-%s' % (v.upstream_version,
+                           v.debian_version)
+    else:
+        v_str = v.upstream_version
+    return '%s_%s.dsc' % (
         package,
-        version.upstream_version,
-        version.debian_version)
+        v_str)
 
 
@@ -82 +86 @@
     This function strips the epoch from the version number and
     replaces any tildes with periods."""
-    v = '%s-%s' % (version.upstream_version,
-                   version.debian_version)
+    if v.debian_version:
+        v = '%s-%s' % (version.upstream_version,
+                       version.debian_version)
+    else:
+        v = version.upstream_version
     return v.replace('~', '.')