mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging
This commit is contained in:
commit
5e85760ff1
|
@ -343,7 +343,7 @@ fi
|
||||||
|
|
||||||
if test -n "$builder"; then
|
if test -n "$builder"; then
|
||||||
test -n "$out" -a -n "$url" -a -n "$rev" || usage
|
test -n "$out" -a -n "$url" -a -n "$rev" || usage
|
||||||
mkdir $out
|
mkdir -p $out
|
||||||
clone_user_rev "$out" "$url" "$rev"
|
clone_user_rev "$out" "$url" "$rev"
|
||||||
else
|
else
|
||||||
if test -z "$hashType"; then
|
if test -z "$hashType"; then
|
||||||
|
@ -368,7 +368,7 @@ else
|
||||||
trap "rm -rf \"$tmpPath\"" EXIT
|
trap "rm -rf \"$tmpPath\"" EXIT
|
||||||
|
|
||||||
tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
|
tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
|
||||||
mkdir "$tmpFile"
|
mkdir -p "$tmpFile"
|
||||||
|
|
||||||
# Perform the checkout.
|
# Perform the checkout.
|
||||||
clone_user_rev "$tmpFile" "$url" "$rev"
|
clone_user_rev "$tmpFile" "$url" "$rev"
|
||||||
|
|
Loading…
Reference in a new issue