- Fix expand option not to fail if files are missing since socket activation

service files are not shipped in the sdist
This commit is contained in:
Scott Kitterman
2020-01-04 01:47:24 -05:00
parent def89db250
commit a8bf7104bc
2 changed files with 28 additions and 21 deletions
+4
View File
@@ -1,3 +1,7 @@
1.2.1
- Fix expand option not to fail if files are missing since socket activation
service files are not shipped in the sdist
1.2.0 2020-01-03 1.2.0 2020-01-03
- Add support for SigningTable, KeyTable, and KeyTableEd25519 (LP: #1797397) - Add support for SigningTable, KeyTable, and KeyTableEd25519 (LP: #1797397)
- Add support for specifying MinimumKeyBits for RSA signatures - Add support for specifying MinimumKeyBits for RSA signatures
+4 -1
View File
@@ -53,9 +53,10 @@ class FileMacroExpand(distutils.cmd.Command):
'system/dkimpy-milter.service', 'system/dkimpy-milter', \ 'system/dkimpy-milter.service', 'system/dkimpy-milter', \
'system/dkimpy-milter.openrc', \ 'system/dkimpy-milter.openrc', \
'system/socket-activation/dkimpy-milter.service', \ 'system/socket-activation/dkimpy-milter.service', \
'system/socket-activation/dkimpy-milter.socket',] 'system/socket-activation/dkimpy-milter.socket', ]
for infile in files: for infile in files:
outfile = '' outfile = ''
try:
filein = open(infile + '.in') filein = open(infile + '.in')
for line in filein: for line in filein:
for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]: for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]:
@@ -76,6 +77,8 @@ class FileMacroExpand(distutils.cmd.Command):
for line in outfile: for line in outfile:
out.write(line) out.write(line)
out.close() out.close()
except FileNotFoundError as x:
pass
kw = {} # Work-around for lack of 'or' requires in setuptools. kw = {} # Work-around for lack of 'or' requires in setuptools.
try: try: