launchpad-reviewers team mailing list archive

[Colin Watson <mp+428807@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-build-tarball into launchpad:master.

Commit message:
Fix build-tarball following sourcedeps removal

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/428807

Now that the `sourcecode` directory is gone, trying to run `find` on it causes an error which means that wheels are omitted from the built tarball.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-build-tarball into launchpad:master.

diff --git a/utilities/build-tarball b/utilities/build-tarball
index 6923320..35e6315 100755
--- a/utilities/build-tarball
+++ b/utilities/build-tarball
@@ -30,10 +30,6 @@ mkdir -p "$output_dir"
     # Most of download-cache is unnecessary since we include a wheelhouse
     # instead, but JavaScript-enabled builds need yarn.
     find ./download-cache/dist/ -name yarn-\*.tar.gz
-    # The subdirectories of sourcecode may be symlinks.  Force tar to
-    # include the actual files instead.
-    find ./sourcecode/*/ \
-        \( -name .bzr -o -name __pycache__ \) -prune -o -type f -print
     echo ./version-info.py
     find ./wheels/ -name \*.whl -print
 ) | sort >"$output_dir/.files"