Skip to content

Commit

Permalink
for data_sets we should not concat with old feed data. Also inc’d ver…
Browse files Browse the repository at this point in the history
…sion
  • Loading branch information
Jason McFarland committed Aug 2, 2017
1 parent bc9cb3f commit d169355
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion cbopensource/connectors/taxii/bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,12 @@ def _import_collection(self, client, site, collection, data_set=False):

logger.info("Found {} new reports.".format(len(reports)))

reports = feed_helper.load_existing_feed_data() + reports
if not data_set:
#
# We only want to concatenate if we are NOT a data set, otherwise we want to refresh all the reports
#
logger.info("Adding existing reports...")
reports = feed_helper.load_existing_feed_data() + reports

logger.info("Total number of reports: {}".format(len(reports)))

Expand Down
2 changes: 1 addition & 1 deletion python-cbtaxii.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define name python-cbtaxii
%define version 1.5
%define unmangled_version 1.5
%define release 7
%define release 9
%global _enable_debug_package 0
%global debug_package %{nil}
%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
Expand Down

0 comments on commit d169355

Please sign in to comment.