Merge lp:~jelmer/bzr-builddeb/lucid-compatibility into lp:bzr-builddeb

[Jelmer Vernooij]

Various fixes to allow the testsuite to run on Lucid and Hardy.

Improve lucid and hardy compatibility:

 * allow dpkg-mergechangelogs to not be available
 * checksums can be plain strings
 * compare Version to Version, older versions of python-debian don't support comparing it with a string

[James Westby (james-w)]

review: Approve

=== modified file 'merge_changelog.py'
--- merge_changelog.py	2011-07-26 13:23:59 +0000
+++ merge_changelog.py	2011-10-13 18:10:35 +0000
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import errno
 import logging
 import os.path
 import re
@@ -60,9 +61,15 @@
         writelines(base_filename, base_lines)
         writelines(this_filename, this_lines)
         writelines(other_filename, other_lines)
-        proc = subprocess.Popen(['dpkg-mergechangelogs', base_filename,
-            this_filename, other_filename], stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+        try:
+            proc = subprocess.Popen(['dpkg-mergechangelogs', base_filename,
+                this_filename, other_filename], stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE)
+        except OSError, e:
+            if e.errno == errno.ENOENT:
+                # No dpkg-mergechangelogs command available
+                return 'not_applicable'
+            raise
         stdout, stderr = proc.communicate()
         retcode = proc.returncode
         if stderr:

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-10-11 21:22:24 +0000
+++ tests/test_import_dsc.py	2011-10-13 18:10:35 +0000
@@ -1885,7 +1885,8 @@
             self.assertEquals(3, len(extractor.upstream_tarballs[0]))
             self.assertTrue(os.path.exists(extractor.upstream_tarballs[0][0]))
             self.assertIs(None, extractor.upstream_tarballs[0][1])
-            self.assertIsInstance(extractor.upstream_tarballs[0][2], unicode) # md5sum
+            self.assertIsInstance(
+                extractor.upstream_tarballs[0][2], basestring) # md5sum
         finally:
             extractor.cleanup()
 
@@ -1970,7 +1971,8 @@
             self.assertEquals(3, len(extractor.upstream_tarballs[0]))
             self.assertTrue(os.path.exists(extractor.upstream_tarballs[0][0]))
             self.assertIs(None, extractor.upstream_tarballs[0][1])
-            self.assertIsInstance(extractor.upstream_tarballs[0][2], unicode) # md5sum
+            self.assertIsInstance(
+                extractor.upstream_tarballs[0][2], basestring) # md5sum
         finally:
             extractor.cleanup()
 

=== modified file 'tests/test_merge_changelog.py'
--- tests/test_merge_changelog.py	2011-07-25 06:26:46 +0000
+++ tests/test_merge_changelog.py	2011-10-13 18:10:35 +0000
@@ -37,6 +37,10 @@
     )
 from bzrlib.plugins import builddeb
 from bzrlib.plugins.builddeb import merge_changelog
+from bzrlib.tests.features import ExecutableFeature
+
+
+dpkg_mergechangelogs_feature = ExecutableFeature('dpkg-mergechangelogs')
 
 
 v_111_2 = """\
@@ -140,6 +144,8 @@
 
 class TestMergeChangelog(tests.TestCase):
 
+    _test_needs_features = [dpkg_mergechangelogs_feature]
+
     def setUp(self):
         super(tests.TestCase, self).setUp()
         # Intercept warnings from merge_changelog's logger: this is where 

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-07-20 19:01:04 +0000
+++ tests/test_merge_upstream.py	2011-10-13 18:10:35 +0000
@@ -89,5 +89,5 @@
         cl = Changelog(open('debian/changelog'))
         self.assertEquals(cl._blocks[0].package, "somepkg")
         self.assertEquals(cl._blocks[0].distributions, "UNRELEASED")
-        self.assertEquals(cl._blocks[0].version, "1.0-1")
+        self.assertEquals(cl._blocks[0].version, Version("1.0-1"))
         self.assertEquals([], list(tree.filter_unversioned_files(["debian/changelog"])))