Fix broken nesting in lib/mv/plugins/postfixadmin.rb.

[mailshears.git] / lib / mv / plugins / postfixadmin.rb

diff --git a/lib/mv/plugins/postfixadmin.rb b/lib/mv/plugins/postfixadmin.rb
index 338be052f63affe1bb8deab2041cd994994cfbb6..9317b4b7d12d6c0dd64702793a072bc951e23178 100644 (file)
--- a/lib/mv/plugins/postfixadmin.rb
+++ b/lib/mv/plugins/postfixadmin.rb
@@ -39,31 +39,20 @@ class PostfixadminMv
 
     sql_queries = [mailbox_query, alias_query1, alias_query2]
 
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)
 
-      sql_queries.each do |sql_query|
-          varchar = 1043 # from pg_type.h
-          params = [{:value => dst.to_s(), :type => varchar},
-                    {:value => dst.domainpart(), :type => varchar},
-                    {:value => dst.localpart(), :type => varchar},
-                    {:value => src.to_s(), :type => varchar}]
-        connection.query(sql_query, params)
-      end
+    sql_queries.each do |sql_query|
+      varchar = 1043 # from pg_type.h
+      params = [{:value => dst.to_s(), :type => varchar},
+                {:value => dst.domainpart(), :type => varchar},
+                {:value => dst.localpart(), :type => varchar},
+                {:value => src.to_s(), :type => varchar}]
 
-      connection.close()
-
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+      connection.query(sql_query, params)
     end
-  end
 
+    connection.close()
+  end
 
 end