Comparison

prosodyctl @ 8561:7b9ffddc4276

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 06 Mar 2018 01:45:58 +0100
parent 8440:4e6710b4f873
parent 8560:489998717387
child 8635:47e3b8b6f17a
comparison
equal deleted inserted replaced
8558:5de663cef508 8561:7b9ffddc4276
864 data = input:read(2^11); 864 data = input:read(2^11);
865 end 865 end
866 assert(input:close()); 866 assert(input:close());
867 assert(output:close()); 867 assert(output:close());
868 if owner and group then 868 if owner and group then
869 local ok = os.execute(("chown %s.%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); 869 local ok = os.execute(("chown %s:%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to)));
870 assert(ok == true or ok == 0, "Failed to change ownership of "..to); 870 assert(ok == true or ok == 0, "Failed to change ownership of "..to);
871 end 871 end
872 if old_umask then pposix.umask(old_umask); end 872 if old_umask then pposix.umask(old_umask); end
873 return true; 873 return true;
874 end 874 end