diff options
| author | agl@chromium.org <agl@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-10-29 15:12:23 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-10-29 15:12:23 +0000 |
| commit | 44196e92bd52bcd86fd4a0a32f3ee1d5cea7498e (patch) | |
| tree | 96f12967b05fd4ee1ca45f454ee752e49ae556a2 | |
| parent | af7d7fa26d82312e3eedf478858061b03180a349 (diff) | |
| download | openssl-44196e92bd52bcd86fd4a0a32f3ee1d5cea7498e.tar.gz | |
third_party/openssl: fix import_from_android.sh when using git.
If there are no .svn directories then SVN fails. Using the -T flag causes it to
create an empty archive instead.
BUG=none
https://codereview.chromium.org/49253003/
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@231570 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rwxr-xr-x | import_from_android.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/import_from_android.sh b/import_from_android.sh index fe40e3e..ea1ab19 100755 --- a/import_from_android.sh +++ b/import_from_android.sh @@ -338,8 +338,10 @@ dump "Checking content of downloaded package: ok" # tarball, which will be extracted after the import process. # dump "Saving .svn subdirectories" +SVN_LIST_FILE=$BUILD_DIR/svn-subdirs +run find . -type d -name ".svn" > $SVN_LIST_FILE SAVED_SVN_TARBALL=$BUILD_DIR/saved-svn-subdirs.tar.gz -run tar czf $SAVED_SVN_TARBALL $(find . -type d -name ".svn") +run tar czf $SAVED_SVN_TARBALL -T $SVN_LIST_FILE # Re-run the import_openssl.sh script. dump "Re-running the 'import_openssl.sh' script to reconfigure all sources." |