Commit f6a7dd04 authored by PidgeyL's avatar PidgeyL
Browse files

Merge remote-tracking branch 'upstream/master'

parents 7409973b 87cabfc2
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ if not args.m:
                     'updater': "{} {}".format(sys.executable, os.path.join(runPath, "db_mgmt_capec.py"))},
                    {'name': 'redis-cache-cpe',
                     'updater': "{} {}".format(sys.executable, os.path.join(runPath, "db_cpe_browser.py"))},
                    {'name': 'msbulletin',
                     'updater': "{} {}".format(sys.executable, os.path.join(runPath, "db_mgmt_ms.py"))},
                    {'name': 'via4',
                     'updater': "{} {}".format(sys.executable, os.path.join(runPath, "db_mgmt_ref.py"))},
                    ])
@@ -68,8 +66,8 @@ if args.f and args.l:


def nbelement(collection=None):
    if collection is None:
        collection = "cve"
    if collection is None or collection == "cve":
        collection = "cves"
    return db.getSize(collection)

def dropcollection(collection=None):