Skip to content

Commit a3163c7

Browse files
Merge pull request #568 from splunk/bugfix/fix-variable-name-for-make-minimal-exclude
fixed variable name m as major_version;
2 parents a03e6b0 + ac4a9d4 commit a3163c7

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

splunk/common-files/make-minimal-exclude.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,24 @@
3030
*/share/splunk/pdf*
3131
*mrsparkle*"""
3232

33-
m = re.match(".*splunk-([0-9]+)\.([0-9]+)\.[0-9]+\.?[0-9]?-[0-9a-z]+-Linux-[0-9a-z_-]+.tgz", sys.argv[1])
33+
version_string = re.match(".*splunk-([0-9]+)\.([0-9]+)\.[0-9]+\.?[0-9]?-[0-9a-z]+-Linux-[0-9a-z_-]+.tgz", sys.argv[1])
34+
major_version = None
35+
minor_version = None
3436

35-
if m and m.group(1):
37+
if version_string:
38+
major_version = version_string.group(1)
39+
minor_version = version_string.group(2)
40+
41+
if major_version:
3642
print(EXCLUDE_V7)
37-
if int(m.group(1)) == 7:
43+
if int(major_version) == 7:
3844
print("*/bin/parsetest*")
39-
if int(m.group(2)) < 3:
45+
if int(minor_version) < 3:
4046
print("*/etc/apps/framework*")
4147
print("*/etc/apps/gettingstarted*")
4248
else:
4349
print("*/etc/apps/splunk_metrics_workspace*")
44-
elif 7 < int(m.group(1)) < 9:
50+
elif 7 < int(major_version) < 9:
4551
print("*/etc/apps/splunk_metrics_workspace*")
46-
if int(m.group(2)) < 1:
52+
if int(minor_version) < 1:
4753
print("*/bin/parsetest*")

0 commit comments

Comments
 (0)