4 files changed, 14 insertions, 16 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 853b0361..96ce35a6 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -230,12 +230,14 @@ function run(rockspec)
          end
       end
    end
-   for name, dest in pairs(built_modules) do
-      fs.make_dir(dest)
-      ok = fs.copy(name, dest)
-      if not ok then
-         err = "Failed installing "..name.." in "..dest
-         break
+   if ok then
+      for name, dest in pairs(built_modules) do
+         fs.make_dir(dest)
+         ok = fs.copy(name, dest)
+         if not ok then
+            err = "Failed installing "..name.." in "..dest
+            break
+         end
       end
    end
    if ok then
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index d6795773..36b33690 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -129,6 +129,7 @@ if lfs_ok then
 -- @return boolean: true if command succeeds (status code 0), false
 -- otherwise.
 function execute_string(cmd)
+   if cfg.verbose then print("Executing: "..cmd) end
    local code = os.execute(cmd)
    if code == 0 or code == true then
       return true
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index e32b8280..eabf125e 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -4,11 +4,6 @@
 -- used by this module.
 module("luarocks.fs.win32.tools", package.seeall)
 
-
---uncomment following line to make executed commands and results visible 
---TODO: make commandline option
---local verbose = true   
-
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
@@ -61,9 +56,9 @@ end
 -- otherwise.
 function execute_string(cmd)
    cmd = command_at(fs.current_dir(), cmd)
-   if verbose then print("Executing: "..tostring(cmd)) end
+   if cfg.verbose then print("Executing: "..tostring(cmd) end
    local code = pack(os.execute(cmd))
-   if verbose then
+   if cfg.verbose then
       print("Results: "..tostring(code.n))
       for i = 1,code.n do
          print("  "..tostring(i).." ("..type(code[i]).."): "..tostring(code[i])) 
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index 4eebf26a..e1e3f80f 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -100,11 +100,11 @@ function run(...)
       new_ver = old_ver
       new_rev = tonumber(old_rev) + 1
    end
-   
+   local new_rockver = new_ver:gsub("-", "")
    
    local out_rs = persist.load_into_table(filename)
    local out_name = out_rs.package:lower()
-   out_rs.version = new_ver.."-"..new_rev
+   out_rs.version = new_rockver.."-"..new_rev
    if url then
       out_rs.source.url = url
       check_url_and_update_md5(out_rs, out_name)
@@ -126,7 +126,7 @@ function run(...)
       out_rs.build.type = "builtin"
    end
    
-   local out_filename = out_name.."-"..new_ver.."-"..new_rev..".rockspec"
+   local out_filename = out_name.."-"..new_rockver.."-"..new_rev..".rockspec"
    
    persist.save_from_table(out_filename, out_rs, order)