aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>2009-04-01 17:27:35 +0000
committerhisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>2009-04-01 17:27:35 +0000
commitb25419643e3adab298363c32fe19e4532d1f9c0b (patch)
treeb228d7784eebf45142d6c76941f13bcf8a08df6b /src
parenta88d6f2eeba2b3355c33fac6d736cf6086342f47 (diff)
downloadluarocks-b25419643e3adab298363c32fe19e4532d1f9c0b.tar.gz
luarocks-b25419643e3adab298363c32fe19e4532d1f9c0b.tar.bz2
luarocks-b25419643e3adab298363c32fe19e4532d1f9c0b.zip
Changes for 1.0.1
git-svn-id: http://luarocks.org/svn/luarocks/trunk@3 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/command_line.lua2
-rw-r--r--src/luarocks/fs/unix.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index b3020284..9389d6ef 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -1,5 +1,5 @@
1 1
2program_version = "1.0" 2program_version = "1.0.1"
3 3
4--- Functions for command-line scripts. 4--- Functions for command-line scripts.
5module("luarocks.command_line", package.seeall) 5module("luarocks.command_line", package.seeall)
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 2a849329..bf72988f 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -161,7 +161,7 @@ end
161-- plus an error message. 161-- plus an error message.
162function copy_contents(src, dest) 162function copy_contents(src, dest)
163 assert(src and dest) 163 assert(src and dest)
164 if fs_execute_string("cp -a "..fs_Q(src).."/* "..fs_Q(dest).." 1> /dev/null 2>/dev/null") then 164 if fs_execute_string("cp -pPR "..fs_Q(src).."/* "..fs_Q(dest).." 1> /dev/null 2>/dev/null") then
165 return true 165 return true
166 else 166 else
167 return false, "Failed copying "..src.." to "..dest 167 return false, "Failed copying "..src.." to "..dest