PR#1085: util: Preserve symlinks when copying - pungi

Lubomír Sedlář • 6 years ago

1d020db

pungi/util.py

file modified

+5 -1

		`@@ -564,7 +564,11 @@`
		`if os.path.isdir(source):`
		`shutil.copytree(source, destination)`
		`else:`
		`- shutil.copy2(source, destination)`
		`+ if os.path.islink(source):`
		`+ # It's a symlink, we should preserve it instead of resolving.`
		`+ os.symlink(os.readlink(source), destination)`
		`+ else:`
		`+ shutil.copy2(source, destination)`

		`return recursive_file_list(src)`

tests/test_util.py

file modified

+27

		`@@ -753,5 +753,32 @@`
		`util.parse_koji_event(self.topdir)`


		`+ class TestCopyAll(PungiTestCase):`
		`+`
		`+ def setUp(self):`
		`+ super(TestCopyAll, self).setUp()`
		`+ self.src = os.path.join(self.topdir, "src")`
		`+ self.dst = os.path.join(self.topdir, "dst")`
		`+ util.makedirs(self.src)`
		`+`
		`+ def test_preserve_symlink(self):`
		`+ touch(os.path.join(self.src, "target"))`
		`+ os.symlink("target", os.path.join(self.src, "symlink"))`
		`+`
		`+ util.copy_all(self.src, self.dst)`
		`+`
		`+ self.assertTrue(os.path.isfile(os.path.join(self.dst, "target")))`
		`+ self.assertTrue(os.path.islink(os.path.join(self.dst, "symlink")))`
		`+ self.assertEqual(os.readlink(os.path.join(self.dst, "symlink")), "target")`
		`+`
		`+ def test_copy_broken_symlink(self):`
		`+ os.symlink("broken", os.path.join(self.src, "symlink"))`
		`+`
		`+ util.copy_all(self.src, self.dst)`
		`+`
		`+ self.assertTrue(os.path.islink(os.path.join(self.dst, "symlink")))`
		`+ self.assertEqual(os.readlink(os.path.join(self.dst, "symlink")), "broken")`
		`+`
		`+`
		`if __name__ == "__main__":`
		`unittest.main()`