From f067828cdc168eac963540f7fffee26293f22c7d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 May 2009 17:00:33 +0000
Subject: Allow question marks in URL...

svn path=/nixpkgs/trunk/; revision=15507
---
 pkgs/build-support/fetchurl/builder.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'pkgs/build-support/fetchurl')

diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index bbdf5fb7b4e2..22ba25e90a4f 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -73,6 +73,9 @@ tryHashedMirrors() {
 }
 
 
+# URL list may contain ?. No glob expansion for that, please
+set -o noglob
+
 urls2=
 for url in $urls; do
     if test "${url:0:9}" != "mirror://"; then
@@ -102,6 +105,8 @@ for url in $urls; do
 done
 urls="$urls2"
 
+# Restore globbing settings
+set +o noglob
 
 if test -n "$showURLs"; then
     echo "$urls" > $out
@@ -113,12 +118,18 @@ if test -n "$preferHashedMirrors"; then
     tryHashedMirrors
 fi
 
+# URL list may contain ?. No glob expansion for that, please
+set -o noglob
+
 success=
 for url in $urls; do
     tryDownload "$url"
     if test -n "$success"; then finish; fi
 done
 
+# Restore globbing settings
+set +o noglob
+
 if test -z "$preferHashedMirrors"; then
     tryHashedMirrors
 fi
-- 
cgit 1.4.1