Compare commits

...

3 Commits

Author SHA1 Message Date
Scott Kitterman 04ef3629d7 Set release date 2020-01-04 14:43:28 -05:00
Scott Kitterman 489238dff0 Correct dkimpy-milter.conf file install location to match expand locations 2020-01-04 02:49:09 -05:00
Scott Kitterman a8bf7104bc - Fix expand option not to fail if files are missing since socket activation
service files are not shipped in the sdist
2020-01-04 01:47:24 -05:00
2 changed files with 32 additions and 24 deletions
+5
View File
@@ -1,3 +1,8 @@
1.2.1 2020-01-04
- Fix expand option not to fail if files are missing since socket activation
service files are not shipped in the sdist
- Correct dkimpy-milter.conf file install location to match expand locations
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
+6 -3
View File
@@ -56,6 +56,7 @@ class FileMacroExpand(distutils.cmd.Command):
'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:
@@ -86,7 +89,7 @@ except ImportError: # If PyDNS is not installed, prefer dnspython
setup( setup(
name='dkimpy-milter', name='dkimpy-milter',
version='1.2.0', version='1.2.1',
author='Scott Kitterman', author='Scott Kitterman',
author_email='scott@kitterman.com', author_email='scott@kitterman.com',
url='https://launchpad.net/dkimpy-milter', url='https://launchpad.net/dkimpy-milter',
@@ -115,8 +118,8 @@ setup(
include_package_data=True, include_package_data=True,
data_files=[(os.path.join('share', 'man', 'man5'), data_files=[(os.path.join('share', 'man', 'man5'),
['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'), ['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'),
['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']), ['man/dkimpy-milter.8']), (os.path.join('etc', 'dkimpy-milter'),
(os.path.join('lib', 'systemd', 'system'), ['etc/dkimpy-milter.conf']), (os.path.join('lib', 'systemd', 'system'),
['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'), ['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'),
['system/dkimpy-milter']), (os.path.join('etc', 'init.d'), ['system/dkimpy-milter']), (os.path.join('etc', 'init.d'),
['system/dkimpy-milter.openrc'])], ['system/dkimpy-milter.openrc'])],