Merge branch '21666-provision-test-improvement'

[arvados.git] / lib / boot / rails_db.go

diff --git a/lib/boot/rails_db.go b/lib/boot/rails_db.go
index 16e150172de2fd372958d476ee27a10a67622129..3464e52b9aa8fa7b8b337f6e7c588243cf4d3ee0 100644 (file)
--- a/lib/boot/rails_db.go
+++ b/lib/boot/rails_db.go
@@ -106,6 +106,9 @@ func migrationList(dir string, log logrus.FieldLogger) (map[string]bool, error)
                        return nil
                }
                fnm := d.Name()
+               if strings.HasSuffix(fnm, "~") {
+                       return nil
+               }
                if !strings.HasSuffix(fnm, ".rb") {
                        log.Warnf("unexpected file in db/migrate dir: %s", fnm)
                        return nil