[Bps-public-commit] smokingit branch, master, updated. a9c77e4fa875e82c48e37223cfdfad0d11cc6db1

[Alex Vandiver]

The branch, master has been updated
       via  a9c77e4fa875e82c48e37223cfdfad0d11cc6db1 (commit)
       via  94d433a0585dd2800c6e15d3528dac3117a1735c (commit)
      from  6d304c7546b9ac9040d35b65e73ac6532d45fb70 (commit)

Summary of changes:
 lib/Smokingit/Model/SmokeResult.pm | 2 ++
 lib/Smokingit/Upgrade.pm           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 94d433a0585dd2800c6e15d3528dac3117a1735c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 21 11:48:11 2013 -0700

    Ensure that exiting post_result early does not leave a database transaction open

diff --git a/lib/Smokingit/Model/SmokeResult.pm b/lib/Smokingit/Model/SmokeResult.pm
index 273c301..75ce7fe 100644
--- a/lib/Smokingit/Model/SmokeResult.pm
+++ b/lib/Smokingit/Model/SmokeResult.pm
@@ -171,8 +171,10 @@ sub post_result {
     my $smokeid = delete $result{smoke_id};
     $self->load( $smokeid );
     if (not $self->id) {
+        Jifty->handle->rollback;
         return (0, "Invalid smoke ID: $smokeid");
     } elsif (not $self->queue_status) {
+        Jifty->handle->rollback;
         return (0, "Smoke report on $smokeid which wasn't being smoked? (last report at @{[$self->submitted_at]})");
     }
 

commit a9c77e4fa875e82c48e37223cfdfad0d11cc6db1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jun 21 11:48:25 2013 -0700

    Fix a minor typo in comment

diff --git a/lib/Smokingit/Upgrade.pm b/lib/Smokingit/Upgrade.pm
index d923537..3236a9a 100644
--- a/lib/Smokingit/Upgrade.pm
+++ b/lib/Smokingit/Upgrade.pm
@@ -19,7 +19,7 @@ since '0.0.3' => sub {
     }
 };
 
-# The branch name beceom a fixed part of the smoke test, and not a
+# The branch name became a fixed part of the smoke test, and not a
 # reference to the branch id; thus, when branches are removed, the smoke
 # result still knows what branch it was on originally.
 since '0.0.4' => sub {

-----------------------------------------------------------------------