Merge pull request #197 from SUSE/fix_duplicate_migrations

Fix duplicate migration paths

Author: ikapelyukhin

Makefile

@@ -1,5 +1,5 @@
 NAME          = rmt-server
-VERSION       = 1.0.2
+VERSION       = 1.0.3
 
 all:
 	@:

app/models/migration_engine.rb

@@ -103,6 +103,7 @@ def sort_migrations(migrations)
       .map { |migration| sort_migration(migration) }
       .sort_by { |migration| migration.map(&:version) }
       .reverse!
+      .uniq
   end
 
   # we sort the migration products, so clients will activate them in the right dependency order

lib/rmt.rb

@@ -1,5 +1,5 @@
 module RMT
-  VERSION ||= '1.0.2'.freeze
+  VERSION ||= '1.0.3'.freeze
 
   DEFAULT_USER = '_rmt'.freeze
   DEFAULT_GROUP = 'nginx'.freeze

package/rmt-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 27 12:18:16 UTC 2018 - ikapelyukhin@suse.com
+
+- Version 1.0.3
+- Fix duplicate migration paths (bsc#1097824)
+
 -------------------------------------------------------------------
 Tue Jun 19 15:01:19 UTC 2018 - ikapelyukhin@suse.com
 

package/rmt-server.spec

@@ -25,7 +25,7 @@
 %define is_sle_12_family 1
 %endif
 Name:           rmt-server
-Version:        1.0.2
+Version:        1.0.3
 Release:        0
 Summary:        Repository mirroring tool and registration proxy for SCC
 License:        GPL-2.0-or-later

spec/models/migration_engine_spec.rb

@@ -463,4 +463,13 @@
       end
     end
   end
+
+  describe '#sort_migrations' do
+    let(:installed_products) { [sle12] }
+    let(:system) { FactoryGirl.create(:system, :with_activated_base_product) }
+
+    it 'removes duplicate migration paths' do
+      expect(engine.send(:sort_migrations, [[sle12], [sle12], [sle12]])).to eq([[sle12]])
+    end
+  end
 end