From ef6a0e715a78689899db064338033c10280f8c2c Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Fri, 18 Oct 2019 12:59:11 -0700 Subject: [PATCH] Fixing errors with new 8.1.x splunk packages --- splunk/common-files/make-minimal-exclude.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/splunk/common-files/make-minimal-exclude.py b/splunk/common-files/make-minimal-exclude.py index 52f23513..36876764 100755 --- a/splunk/common-files/make-minimal-exclude.py +++ b/splunk/common-files/make-minimal-exclude.py @@ -9,7 +9,6 @@ */bin/*mongo* */3rdparty/Copyright-for-mongo* */bin/node* -*/bin/parsetest* */bin/pcregextest* */etc/*.lic* */etc/anonymizer* @@ -34,13 +33,15 @@ m = re.match(".*splunk-([0-9]+)\.([0-9]+)\.[0-9]+\.?[0-9]?-[0-9a-z]+-Linux-[0-9a-z_-]+.tgz", sys.argv[1]) if m and m.group(1): - if m.group(1) == "7": - print EXCLUDE_V7 + print(EXCLUDE_V7) + if int(m.group(1)) == 7: + print("*/bin/parsetest*") if int(m.group(2)) < 3: - print "*/etc/apps/framework*" - print "*/etc/apps/gettingstarted*" + print("*/etc/apps/framework*") + print("*/etc/apps/gettingstarted*") else: - print "*/etc/apps/splunk_metrics_workspace*" + print("*/etc/apps/splunk_metrics_workspace*") elif int(m.group(1)) > 7: - print EXCLUDE_V7 - print "*/etc/apps/splunk_metrics_workspace*" + print("*/etc/apps/splunk_metrics_workspace*") + if int(m.group(2)) < 1: + print("*/bin/parsetest*")