summary refs log tree commit diff
path: root/pkgs/build-support/rust
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2017-04-23 19:22:06 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2017-05-23 10:01:33 +0200
commit19d3cf81d3436a6600f261579b55b9132a6ca8fb (patch)
treef9bf700f48f7e74dce97cedd8b1b697bdac1bc1c /pkgs/build-support/rust
parent3dc0792ec6d660f91d38a53ab94467d1b4408935 (diff)
downloadnixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar.gz
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar.bz2
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar.lz
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar.xz
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.tar.zst
nixpkgs-19d3cf81d3436a6600f261579b55b9132a6ca8fb.zip
rust: fix fetch-cargo-deps for git dependencies
We need to make sure that `$revs` ends with a space, since files must always
end with newlines. The previous code ignored the last entry in `$revs`, because
read already returns non-zero exit code for the last entry, as it does not end
with a space.
Diffstat (limited to 'pkgs/build-support/rust')
-rwxr-xr-xpkgs/build-support/rust/fetch-cargo-deps4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 76661a4f9ec..3c7e034364f 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -148,7 +148,7 @@ EOF
 
             cd "$out/git/checkouts/$name/$branch"
             rev="$(git rev-parse HEAD)"
-            revs="$revs $rev"
+            revs="$rev $revs"
         done < <(find . -type d -name .git -print)
 
         echo "List of revs to keep for git db $name: $revs"
@@ -179,7 +179,7 @@ EOF
             done
 
             # Create ad-hoc branches for the revs we need
-            echo "$revs" | tr " " "\n" | while read -d " " rev; do
+            echo "$revs" | while read -d " " rev; do
                 echo "Creating git branch b_$rev $rev"
                 git branch b_$rev $rev
             done