From: Daniel Pittman <[email protected]>

The code in this migration assumed that the progress bar was always created;
in some cases this wasn't possible, but the fault was hidden by the second
fault created interacting with a nil value.

Paired-With: Josh Cooper <[email protected]>
Signed-off-by: Josh Cooper <[email protected]>
---
Local-branch: feature/master/7967-display-report-import-failures
 db/migrate/20091217212330_migrate_report_data.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/db/migrate/20091217212330_migrate_report_data.rb 
b/db/migrate/20091217212330_migrate_report_data.rb
index 6256c5a..0f3b0b8 100644
--- a/db/migrate/20091217212330_migrate_report_data.rb
+++ b/db/migrate/20091217212330_migrate_report_data.rb
@@ -7,7 +7,7 @@ class MigrateReportData < ActiveRecord::Migration
       reports.each{|r| r.send(:set_attributes); r.save_without_validation; 
pbar.inc}
     end
   ensure
-    pbar.finish
+    pbar and pbar.finish
   end
 
   def self.down
-- 
1.7.4.4

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to