--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/10/08 21:54:20 1.86 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/10/08 21:57:54 1.87 @@ -85,7 +85,9 @@ my ($pid, $fh); unless ($pid = open $fh, "-|:utf8", "-") { $SIG{__DIE__} = sub { - warn "FATAL: @_\n"; + my $msg = $_[0]; + $msg =~ s/\n+/\n/; + warn "FATAL: $msg"; CFPlus::_exit 99; }; @@ -126,6 +128,10 @@ if (1) { # upload a map my $mapname = $::CONN->{map_info}[0]; + my $mappath = "$mapdir/$mapname"; + + -e $mappath and die "$mappath already exists\n"; + print "getting map revision for $mapname...\n"; # try to get the most recent head revision, what a hack, @@ -146,18 +152,16 @@ cf_login => $::PROFILE->{user}, }; - my $mappath = "$mapdir/$mapname"; - require File::Basename; require File::Path; File::Path::mkpath (File::Basename::dirname ($mappath)); open my $fh, ">:raw:perlio", "$mappath.meta" - or die "$mappath.meta: $!"; + or die "$mappath.meta: $!\n"; print $fh CFPlus::to_json $meta; close $fh; open my $fh, ">:raw:perlio:utf8", $mappath - or die "$mappath: $!"; + or die "$mappath: $!\n"; print $fh $map; close $fh;