Commit 68f4d488 authored by PidgeyL's avatar PidgeyL
Browse files

fix merge

parents c13b50e0 c703b725
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ def sanitize(x):
    x=list(x)
  if type(x)==list:
    for y in x: sanitize(y)
#  if x:
  if "_id" in x: x.pop("_id")
  if x and  "_id" in x: x.pop("_id")
  return x

# DB Functions
+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ if __name__ == '__main__':
                    item['cvss'] = defaultvalue['cvss']
                if 'cwe' not in item:
                    item['cwe'] = defaultvalue['cwe']
                dbLayerr.updateCVE(item)
                dbLayer.updateCVE(item)
            else:
                dbLayer.insertCVE(item)
        # get the 'recent' file
@@ -237,7 +237,7 @@ if __name__ == '__main__':
        parser.parse(f)
        for item in progressbar(ch.cves):
            # check if the CVE already exists.
            x = dbeLayer.getCVE(item['id'])
            x = dbLayer.getCVE(item['id'])
            # if so, update the entry.
            if x:
                if args.v: