commit 9522fea619d19203bb81b4220097f854beb2e556
parent ff6e6801ea7c2804dc061db00632ac7c0d370d32
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 9 Mar 2008 10:44:01 -0700
Merge branch 'master' into next
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -169,7 +169,8 @@ if File.exists? Redwood::CONFIG_FN
else
require 'etc'
require 'socket'
- name = Etc.getpwnam(ENV["USER"]).gecos.split(/,/).first
+ name = Etc.getpwnam(ENV["USER"]).gecos.split(/,/).first rescue nil
+ name ||= ENV["USER"]
email = ENV["USER"] + "@" +
begin
Socket.gethostbyname(Socket.gethostname).first