[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r250: Don't try and look for .changes file with the epoch in the name.

[James Westby]

------------------------------------------------------------
revno: 250
committer: James Westby <jw+debian at jameswestby.net>
branch nick: 2.0
timestamp: Wed 2008-08-27 02:13:12 +0100
message:
  Don't try and look for .changes file with the epoch in the name.
modified:
  builder.py
  properties.py
-------------- next part --------------
=== modified file 'builder.py'
--- a/builder.py	2008-08-26 17:41:31 +0000
+++ b/builder.py	2008-08-27 01:13:12 +0000
@@ -323,7 +323,7 @@
     The files are found by reading the changes file.
     """
     package = self._properties.package()
-    version = self._properties.full_version()
+    version = self._properties.full_version_no_epoch()
     try:
         changes = DebianChanges(package, version,
                 self._properties.build_dir(), arch=arch)

=== modified file 'properties.py'
--- a/properties.py	2007-10-29 18:00:52 +0000
+++ b/properties.py	2008-08-27 01:13:12 +0000
@@ -40,6 +40,11 @@
   def full_version(self):
     return self._changelog.full_version
 
+  def full_version_no_epoch(self):
+    if self._changelog.debian_version is None:
+        return self.upstream_version()
+    return self.upstream_version() + "-" + self.debian_version()
+
   def build_dir(self):
     return self._build_dir