Merge lp:~jelmer/bzr-builddeb/619295-unversioned-debian-symlink into lp:bzr-builddeb

[Jelmer Vernooij]

This fixes bzr-builddeb to cope with unversioned "debian/" symlinks.

[James Westby (james-w)]

review: Approve

[James Westby (james-w)]

Oh, should probably have SymlinkFeature protecting the test? Not that running
the tests on Windows would do very well.

Thanks,

James

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-03 10:37:01 +0000
+++ debian/changelog	2011-02-03 11:02:48 +0000
@@ -45,8 +45,10 @@
     kind of compression is supported on tarballs. LP: #627718
   * Support upstream version strings containing dashes. Patch by Stefano
     Rivera. LP: #711826
+  * Support unversioned debian/ symlink in working tree when finding
+    changelog and larstiq mode. LP: #619295
 
- -- Jelmer Vernooij <[e-mail]>  Thu, 03 Feb 2011 11:36:59 +0100
+ -- Jelmer Vernooij <[e-mail]>  Thu, 03 Feb 2011 11:59:26 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-01-28 17:14:25 +0000
+++ tests/test_util.py	2011-02-03 11:02:48 +0000
@@ -170,6 +170,15 @@
         self.assertEqual(str(cl), cl_block1)
         self.assertEqual(lq, True)
 
+    def test_find_changelog_lq_unversioned_debian_symlink(self):
+        # LarstiQ mode, but with an unversioned "debian" -> "." symlink.
+        # Bug 619295
+        tree = self.make_branch_and_tree('.')
+        self.write_changelog('changelog')
+        tree.add(['changelog'])
+        os.symlink('.', 'debian')
+        self.assertRaises(AddChangelogError, find_changelog, tree, True)
+
     def test_find_changelog_nomerge_lq(self):
         tree = self.make_branch_and_tree('.')
         self.write_changelog('changelog')

=== modified file 'util.py'
--- util.py	2011-02-02 16:04:04 +0000
+++ util.py	2011-02-03 11:02:48 +0000
@@ -158,7 +158,9 @@
             # If it is a "larstiq" pacakge and debian is a symlink to
             # "." then it will have found debian/changelog. Try and detect
             # this.
-            if (t.kind(t.path2id('debian')) == 'symlink' and 
+            debian_file_id = t.path2id('debian')
+            if (debian_file_id is not None and 
+                t.kind(debian_file_id) == 'symlink' and 
                 t.get_symlink_target(t.path2id('debian')) == '.'):
                 changelog_file = 'changelog'
                 larstiq = True