grahamc/hydra - Change FPA5UO23AIK2C6UDZ6JKKTXKKBAG2GB5ASHMOTNVI2LS2OE6IOKAC

Use mktemp for tempdir creation in prefetchers.

This incorporates the following two commits from <nixpkgs>:

NixOS/nixpkgs@f83af95f8a54d0375ac6e159b663de887ba5b6a6 NixOS/nixpkgs@5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801

Hydra was the original reason why I was fixing tempdir creation in the first place. Seeing that Hydra ships its own versions of these scripts, we need to patch them here as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Created by aszlig on August 28, 2014

FPA5UO23AIK2C6UDZ6JKKTXKKBAG2GB5ASHMOTNVI2LS2OE6IOKAC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/script/nix-prefetch-bzr at line 46 [3.1]

B:BD[3.1039] → [3.1039:1125]

    tmpPath=/tmp/bzr-checkout-tmp-$$
    tmpFile=$tmpPath/$dstFile
    mkdir $tmpPath

[3.1039]

[3.1125]

    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")"
    trap "rm -rf \"$tmpPath\"" EXIT

Replacement in src/script/nix-prefetch-bzr at line 49 [3.1]
B:BD[3.1126] → [3.1126:1158]
```
    trap "rm -rf $tmpPath" EXIT
```
[3.1126]
[3.1158]
```
    tmpFile="$tmpPath/$dstFile"
```

Replacement in src/script/nix-prefetch-git at line 240 [3.1944]

B:BD[2.5777] → [2.5777:5880]

      tmpPath=/tmp/git-checkout-tmp-$$
      tmpFile=$tmpPath/git-export
      mkdir $tmpPath $tmpFile

[2.5777]

[2.5880]

      tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
      trap "rm -rf \"$tmpPath\"" EXIT

Replacement in src/script/nix-prefetch-git at line 243 [3.1944]

B:BD[2.5881] → [2.5881:5915]

      trap "rm -rf $tmpPath" EXIT

[2.5881]

[2.5915]

      tmpFile="$tmpPath/git-export"
      mkdir "$tmpFile"

Replacement in src/script/nix-prefetch-hg at line 38 [3.8537]

B:BD[3.9307] → [3.9307:9397]

    tmpPath=/tmp/hg-checkout-tmp-$$
    tmpArchive=$tmpPath/hg-archive
    mkdir $tmpPath

[3.9307]

[3.9397]

    tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
    trap "rm -rf \"$tmpPath\"" EXIT

Replacement in src/script/nix-prefetch-hg at line 41 [3.8537]
B:BD[3.9398] → [3.9398:9430]
```
    trap "rm -rf $tmpPath" EXIT
```
[3.9398]
[3.9430]
```
    tmpArchive="$tmpPath/hg-archive"
```