From 56360fee903aed7e4f0ed2b3b9dff4b6f7a8172a Mon Sep 17 00:00:00 2001
From: Fabien Tassin <fta@sofaraway.org>
Date: Fri, 13 Jun 2008 23:29:18 +0200
Subject: * Die with a stack trace   - update
 src/mozclient/lib/MozClient/VCS.pm   - update
 src/mozclient/lib/MozClient/CVS.pm   - update
 src/mozclient/lib/MozClient/Subversion.pm

---
 src/mozclient/lib/MozClient/CVS.pm        |  3 ++-
 src/mozclient/lib/MozClient/Subversion.pm |  2 +-
 src/mozclient/lib/MozClient/VCS.pm        | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/mozclient/lib/MozClient/CVS.pm b/src/mozclient/lib/MozClient/CVS.pm
index 0ce6118..a7bd1b6 100644
--- a/src/mozclient/lib/MozClient/CVS.pm
+++ b/src/mozclient/lib/MozClient/CVS.pm
@@ -23,6 +23,7 @@ package MozClient::CVS;
 
 use vars qw(@ISA);
 use strict;
+use Carp;
 use MozClient::VCS;
 
 @ISA = ("MozClient::VCS");
@@ -48,7 +49,7 @@ sub do_dynamic_tag {
   $self->LOG("MozClient::CVS::do_dynamic_tag()");
   # We want a dynamic TAG. Fetch files listed in MOZCLIENT_DYNTAG_FILES, then
   # apply MOZCLIENT_DYNTAG rule to set $want_tag
-  die "Error: Missing MOZCLIENT_DYNTAG_FILES\n"
+  confess "Error: Missing MOZCLIENT_DYNTAG_FILES"
     unless defined $self->{'MOZCLIENT_DYNTAG_FILES'};
   $self->chdir($self->work_dir);
   my $date = "";
diff --git a/src/mozclient/lib/MozClient/Subversion.pm b/src/mozclient/lib/MozClient/Subversion.pm
index 8b7bf0e..d05e9b0 100644
--- a/src/mozclient/lib/MozClient/Subversion.pm
+++ b/src/mozclient/lib/MozClient/Subversion.pm
@@ -67,7 +67,7 @@ sub set_tag {
 sub checkout {
   my $self = shift;
 
-  $self->LOG("MozClient:Subversion::checkout:()");
+  $self->LOG("MozClient::Subversion::checkout:()");
 
   $self->chdir($self->work_dir);
   my $modules = [];
diff --git a/src/mozclient/lib/MozClient/VCS.pm b/src/mozclient/lib/MozClient/VCS.pm
index 228d6c9..4434ca8 100644
--- a/src/mozclient/lib/MozClient/VCS.pm
+++ b/src/mozclient/lib/MozClient/VCS.pm
@@ -132,7 +132,7 @@ sub run_system {
   my $cmd = sprintf "%s", @_;
   my $args = &main::_split_args($cmd);
   my $ret = system(@$args);
-  $ret == 0 || carp "Can't run '$cmd': error code $ret\n";
+  $ret == 0 || confess "Can't run '$cmd': error code $ret";
 }
 
 sub run_shell {
@@ -148,7 +148,7 @@ sub chdir {
 
   $self->LOG2("\$ cd %s", @_);
   my $dir = shift;
-  CORE::chdir($dir) || carp "Can't chdir($dir): $!\n";
+  CORE::chdir($dir) || confess "Can't chdir($dir): $!";
 }
 
 sub unlink {
@@ -157,7 +157,7 @@ sub unlink {
   $self->LOG2("\$ rm %s", @_);
   my $file = shift;
 
-  CORE::unlink($file) || carp "Can't unlink($file): $!\n";
+  CORE::unlink($file) || confess "Can't unlink($file): $!";
 }
 
 sub mkdir {
@@ -165,7 +165,7 @@ sub mkdir {
   my $dir  = shift;
   my $mode = shift;
   $self->LOG2("\$ mkdir %s", $dir);
-  CORE::mkdir($dir, $mode) || carp "Can't mkdir($dir, $mode): $!\n";
+  CORE::mkdir($dir, $mode) || confess "Can't mkdir($dir, $mode): $!";
 }
 
 sub want_list_tags {
@@ -178,7 +178,7 @@ sub list_tags {
   my $self = shift;
 
   $self->LOG("MozClient::list_tags()");
-  die "Error: list_tags() not supported for " . $self->vcs;
+  confess "Error: list_tags() not supported for " . $self->vcs;
 }
 
 # Execute the command defined in MOZCLIENT_POSTCOCMD after the checkout
@@ -195,35 +195,35 @@ sub get_client {
   my $self = shift;
 
   $self->LOG("MozClient::get_client()");
-  die "Can't MozClient::get_client() for " . $self->vcs;
+  confess "Can't MozClient::get_client() for " . $self->vcs;
 }
 
 sub set_tag {
   my $self = shift;
 
   $self->LOG("MozClient::set_tag()");
-  die "Can't MozClient::set_tag() for " . $self->vcs;
+  confess "Can't MozClient::set_tag() for " . $self->vcs;
 }
 
 sub set_revdate {
   my $self = shift;
 
   $self->LOG("MozClient::set_revdate()");
-  die "Can't MozClient::set_revdate() for " . $self->vcs;
+  confess "Can't MozClient::set_revdate() for " . $self->vcs;
 }
 
 sub convert_revdate {
   my $self = shift;
 
   $self->LOG("MozClient::convert_revdate()");
-  die "Can't MozClient::convert_revdate() for " . $self->vcs;
+  confess "Can't MozClient::convert_revdate() for " . $self->vcs;
 }
 
 sub do_dynamic_tag {
   my $self = shift;
 
   $self->LOG("MozClient::do_dynamic_tag()");
-  die "Error: do_dynamic_tag() not supported for " . $self->vcs;
+  confess "Error: do_dynamic_tag() not supported for " . $self->vcs;
 }
 
 sub setup {
@@ -266,7 +266,7 @@ sub checkout {
   my $self = shift;
 
   $self->LOG("MozClient::checkout()");
-  die "Can't MozClient::checkout() for " . $self->vcs;
+  confess "Can't MozClient::checkout() for " . $self->vcs;
 }
 
 sub nobin_cleanup {
-- 
cgit v1.2.3