Merge branch 'master' of github.com:keplerproject/luarocks

3 files changed, 12 insertions, 4 deletions

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index a2cdcf08..b10594a3 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -211,7 +211,7 @@ end
 function parse_dep(dep)
    assert(type(dep) == "string")
 
-   local name, rest = dep:match("^%s*(%a[%w%-]*%w)%s*(.*)")
+   local name, rest = dep:match("^%s*([a-zA-Z][a-zA-Z0-9%.%-%_]*)%s*(.*)")
    if not name then return nil end
    local constraints = parse_constraints(rest)
    if not constraints then return nil end
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index c3b5398e..d2613b67 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -246,7 +246,8 @@ function find(at)
    local pipe = io.popen(command_at(at, "find 2> NUL"))
    for file in pipe:lines() do
       -- Windows find is a bit different
-      if file:sub(1,2)==".\\" then file=file:sub(3) end
+      local first_two = file:sub(1,2)
+      if first_two == ".\\" or first_two == "./" then file=file:sub(3) end
       if file ~= "." then
          table.insert(result, (file:gsub("\\", "/")))
       end
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index e2b59a6f..5546a649 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -163,9 +163,16 @@ function run(...)
       return nil, "Argument missing, see help."
    end
 
+   local file, err
    if arg:match(".*%.rockspec") then
-      return pack_source_rock(arg)
+      file, err = pack_source_rock(arg)
    else
-      return pack_binary_rock(arg, version)
+      file, err = pack_binary_rock(arg, version)
+   end
+   if err then
+      return nil, err
+   else
+      print("Packed: "..file)
+      return true
    end
 end