X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d9e070e06956801aba2378c1b79b4d9f13ae12ee..c6592045c482d9086d5db6ebab87db49aa85cefa:/db/migrate/017_populate_node_tags_and_remove.rb

diff --git a/db/migrate/017_populate_node_tags_and_remove.rb b/db/migrate/017_populate_node_tags_and_remove.rb
index 29a91c70b..f10bf16d2 100644
--- a/db/migrate/017_populate_node_tags_and_remove.rb
+++ b/db/migrate/017_populate_node_tags_and_remove.rb
@@ -3,23 +3,21 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i != 0
 
     if have_nodes
-      prefix = File.join Dir.tmpdir, "013_populate_node_tags_and_remove.#{$$}."
+      prefix = File.join Dir.tmpdir, "017_populate_node_tags_and_remove.#{$$}."
 
-      cmd = "db/migrate/013_populate_node_tags_and_remove_helper"
+      cmd = "db/migrate/017_populate_node_tags_and_remove_helper"
       src = "#{cmd}.c"
       if not File.exists? cmd or File.mtime(cmd) < File.mtime(src) then 
-	system 'cc -O3 -Wall `mysql_config --cflags --libs` ' +
-	  "#{src} -o #{cmd}" or fail
+        system 'cc -O3 -Wall `mysql_config --cflags --libs` ' +
+          "#{src} -o #{cmd}" or fail
       end
 
-      conn_opts = ActiveRecord::Base.connection.
-	instance_eval { @connection_options }
+      conn_opts = ActiveRecord::Base.connection.instance_eval { @connection_options }
       args = conn_opts.map { |arg| arg.to_s } + [prefix]
       fail "#{cmd} failed" unless system cmd, *args
 
-      tempfiles = ['nodes', 'node_tags',
-	  'current_nodes', 'current_node_tags'].
-	map { |base| prefix + base }
+      tempfiles = ['nodes', 'node_tags', 'current_nodes', 'current_node_tags'].
+        map { |base| prefix + base }
       nodes, node_tags, current_nodes, current_node_tags = tempfiles
     end