Merge branch 'bug/MSP-10724/fix-import-failure' into staging/electro-release MSP-10724 #land

Author: kgray-r7

lib/msf/core/db.rb

@@ -1372,8 +1372,6 @@ def report_note(opts)
 =end
     ntype  = opts.delete(:type) || opts.delete(:ntype) || (raise RuntimeError, "A note :type or :ntype is required")
     data   = opts[:data]
-    method = nil
-    args   = []
     note   = nil
 
     conditions = { :ntype => ntype }
@@ -1382,15 +1380,7 @@ def report_note(opts)
 
     case mode
     when :unique
-      notes = wspace.notes.where(conditions)
-
-      # Only one note of this type should exist, make a new one if it
-      # isn't there. If it is, grab it and overwrite its data.
-      if notes.empty?
-        note = wspace.notes.new(conditions)
-      else
-        note = notes[0]
-      end
+      note      = wspace.notes.where(conditions).first_or_initialize
       note.data = data
     when :unique_data
       notes = wspace.notes.where(conditions)