aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure8
-rw-r--r--src/luarocks/deps.lua2
2 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index 75ba4039..665d52bc 100755
--- a/configure
+++ b/configure
@@ -101,7 +101,7 @@ find_helper() {
101 fi 101 fi
102 shift 102 shift
103 done 103 done
104 echo "Could not find a $explanation. Tried: $tried." 104 echo "Could not find $explanation. Tried: $tried."
105 die "Make sure one of them is installed and available in your PATH." 105 die "Make sure one of them is installed and available in your PATH."
106} 106}
107 107
@@ -362,16 +362,18 @@ fi
362 362
363if [ "$LUAROCKS_DOWNLOADER_SET" != "yes" ] 363if [ "$LUAROCKS_DOWNLOADER_SET" != "yes" ]
364then 364then
365 find_helper "downloader helper program" curl wget fetch 365 find_helper "a downloader helper program" curl wget fetch
366 LUAROCKS_DOWNLOADER=$HELPER 366 LUAROCKS_DOWNLOADER=$HELPER
367fi 367fi
368 368
369if [ "$LUAROCKS_MD5CHECKER_SET" != "yes" ] 369if [ "$LUAROCKS_MD5CHECKER_SET" != "yes" ]
370then 370then
371 find_helper "MD5 checksum calculator" md5sum openssl md5 371 find_helper "a MD5 checksum calculator" md5sum openssl md5
372 LUAROCKS_MD5CHECKER=$HELPER 372 LUAROCKS_MD5CHECKER=$HELPER
373fi 373fi
374 374
375find_helper "an 'unzip' program" unzip
376
375echo_n "Configuring for system... " 377echo_n "Configuring for system... "
376if uname -s 378if uname -s
377then 379then
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index acc571f8..a2215351 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -488,7 +488,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
488 if not rock then 488 if not rock then
489 return nil, "Could not satisfy dependency: "..deps.show_dep(dep) 489 return nil, "Could not satisfy dependency: "..deps.show_dep(dep)
490 end 490 end
491 local ok, err, errcode = install.run(rock) 491 local ok, err, errcode = install.run(rock, deps.deps_mode_to_flag(deps_mode))
492 if not ok then 492 if not ok then
493 return nil, "Failed installing dependency: "..rock.." - "..err, errcode 493 return nil, "Failed installing dependency: "..rock.." - "..err, errcode
494 end 494 end