Merge lp:~mvo/click/do-not-crash-in-build-on-broken-symlinks into lp:click/devel

[Michael Vogt]

Right now click build will crash if there is a broken symlink in the click.
This branch fixes this crash.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'click/build.py'
--- click/build.py	2014-05-05 13:10:19 +0000
+++ click/build.py	2015-01-19 10:27:52 +0000
@@ -274,7 +274,10 @@
             with open(md5sums_path, "w") as md5sums:
                 for path in sorted(self.list_files(root_path)):
                     md5 = hashlib.md5()
-                    with open(os.path.join(root_path, path), "rb") as f:
+                    p = os.path.join(root_path, path)
+                    if not os.path.exists(p):
+                        continue
+                    with open(p, "rb") as f:
                         while True:
                             buf = f.read(16384)
                             if not buf:

=== modified file 'click/tests/test_build.py'
--- click/tests/test_build.py	2014-09-04 13:41:30 +0000
+++ click/tests/test_build.py	2015-01-19 10:27:52 +0000
@@ -134,6 +134,8 @@
         touch(os.path.join(scratch, ".git", "config"))
         with mkfile(os.path.join(scratch, "toplevel")) as f:
             f.write("test /toplevel\n")
+        os.symlink(
+            "file-does-not-exist", os.path.join(scratch, "broken-symlink"))
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
                 "name": "com.example.test",