Merge lp:~debfx/ubuntu/precise/pkgbinarymangler/dependency-cycle into lp:ubuntu/precise/pkgbinarymangler

[Felix Geyer]

  * pkgstripfiles, symlink_doc(): Don't create symlinks that would point to
    the same package. (LP: #923343)
  * test/run: Add test_doc_symlink_dependency_cycle() to make sure that
    pkgstripfiles works correctly when there is a dependency cycle inside
    a source package.

[Dave Walker (davewalker)]

pkgstripfiles change looks good and simple.. the Test looks valid.. Happy to upload if you can confirm it's ready..

Thanks.

review: Approve

[Martin Pitt (pitti)]

This looks fine to me, thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-13 16:06:28 +0000
+++ debian/changelog	2012-01-29 13:50:30 +0000
@@ -1,3 +1,13 @@
+pkgbinarymangler (114) UNRELEASED; urgency=low
+
+  * pkgstripfiles, symlink_doc(): Don't create symlinks that would point to
+    the same package. (LP: #923343)
+  * test/run: Add test_doc_symlink_dependency_cycle() to make sure that
+    pkgstripfiles works correctly when there is a dependency cycle inside
+    a source package.
+
+ -- Felix Geyer <[e-mail]>  Sun, 29 Jan 2012 12:45:35 +0100
+
 pkgbinarymangler (113) precise; urgency=low
 
   * dh_translations: fixes previous issues harder (lp: #913085)

=== modified file 'pkgstripfiles'
--- pkgstripfiles	2011-12-12 11:19:19 +0000
+++ pkgstripfiles	2012-01-29 13:50:30 +0000
@@ -149,6 +149,7 @@
 		    depfile="$r/../$dep/usr/share/doc/$dep/$f"
 		fi
 
+		[ "$dep" != "$PKGNAME" ] || continue
 		[ -f "$depfile" ] || continue
 
 		# special-case Debian changelog: as we truncate them they may

=== modified file 'test/run'
--- test/run	2011-12-12 09:41:52 +0000
+++ test/run	2012-01-29 13:50:30 +0000
@@ -967,6 +967,41 @@
         self.assertEqual(c['chocolate']['./usr/share/doc/chocolate/test.c']['linkto'], '../vanilla/test.c')
         self.assertEqual(c['chocolate']['./usr/share/doc/chocolate/changelog.gz']['linkto'], '../vanilla/changelog.gz')
 
+    def test_doc_symlink_dependency_cycle(self):
+        '''doc symlinking: cyclic dependency'''
+
+        with open(os.path.join(self.pkgdir, 'debian', 'vanilla.docs'), 'w') as f:
+            f.write('test.c')
+        with open(os.path.join(self.pkgdir, 'debian', 'chocolate.docs'), 'w') as f:
+            f.write('test.c')
+        self.sed_control('/^Architecture:/ s/any/all/g')
+        self.sed_control('s/^Description: vanilla/Depends: chocolate\\n&/')
+        self.sed_control('s/^Description: chocolate/Depends: vanilla\\n&/')
+        orig_size = os.path.getsize(os.path.join(self.pkgdir, 'test.c'))
+
+        self.build()
+        c = self.deb_contents()
+
+        vanilla_link = c['vanilla']['./usr/share/doc/vanilla/test.c']['linkto']
+        chocolate_link = c['chocolate']['./usr/share/doc/chocolate/test.c']['linkto']
+
+        # exactly one of them has to be a symlink
+        self.assertTrue(vanilla_link is None or chocolate_link is None)
+        self.assertTrue(vanilla_link is not None or chocolate_link is not None)
+
+        if vanilla_link is None:
+            file_pkg = "vanilla"
+            link_pkg = "chocolate"
+        else:
+            file_pkg = "chocolate"
+            link_pkg = "vanilla"
+
+        self.assertEqual(c[file_pkg]['./usr/share/doc/%s/test.c' % (file_pkg,)]['linkto'], None)
+        self.assertEqual(c[file_pkg]['./usr/share/doc/%s/test.c' % (file_pkg,)]['size'], orig_size)
+        self.assertEqual(c[file_pkg]['./usr/share/doc/%s/changelog.gz' % (file_pkg,)]['linkto'], None)
+        self.assertEqual(c[link_pkg]['./usr/share/doc/%s/test.c' % (link_pkg,)]['linkto'], '../%s/test.c' % (file_pkg,))
+        self.assertEqual(c[link_pkg]['./usr/share/doc/%s/changelog.gz' % (link_pkg,)]['linkto'], '../%s/changelog.gz' % (file_pkg,))
+
     def test_doc_symlink_disable(self):
         '''doc symlinking: Disabling with $NO_DOC_PKG_MANGLE'''