Attachment #215694 for bug #247372

View | Details | Raw Unified | Return to bug 247372
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 3000.3	5	PORTVERSION= 3001
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590047008	1	TIMESTAMP = 1592464695
2	SHA256 (salt-3000.3.tar.gz) = fcca49985e697d914e5a7f34b2fd8bbd833bcf7779d30174a279a4de2294cea7	2	SHA256 (salt-3001.tar.gz) = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154
3	SIZE (salt-3000.3.tar.gz) = 15237557	3	SIZE (salt-3001.tar.gz) = 14448043

Lines 1-11 Link Here

(-)files/patch-salt_loader.py (-5 / +7 lines)
1	--- salt/loader.py	1	--- salt/loader.py.orig 2020-06-18 07:20:08 UTC
2	+++ salt/loader.py	2	+++ salt/loader.py
3	@@ -1240,7 +1240,7 @@	3	@@ -1383,9 +1383,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
4	try:	4	try:
5	pycache_files = [	5	pycache_files = [
6	os.path.join('__pycache__', x) for x in	6	os.path.join("__pycache__", x)
7	- sorted(os.listdir(os.path.join(mod_dir, '__pycache__')))	7	- for x in sorted(
8	+ sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc')	8	- os.listdir(os.path.join(mod_dir, "__pycache__"))
		9	- )
		10	+ for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc')
9	]	11	]
10	except OSError:	12	except OSError:
11	pass	13	pass




--- setup.py.orig	2020-06-18 07:24:31 UTC
+++ setup.py
@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution):
     def _property_data_files(self):
         # Data files common to all scenarios
         data_files = [
-            ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]),
-            ("share/man/man7", ["doc/man/salt.7"]),
+            ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
+            ('man/man7', ['doc/man/salt.7'])
         ]
         if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
             data_files[0][1].append("doc/man/salt-ssh.1")

Return to bug 247372

Lines 1-13 Link Here

(-)files/patch-setup.py (-5 / +5 lines)
1	--- setup.py.orig 2018-04-02 16:35:13 UTC	1	--- setup.py.orig 2020-06-18 07:24:31 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di	3	@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution):
4	def _property_data_files(self):	4	def _property_data_files(self):
5	# Data files common to all scenarios	5	# Data files common to all scenarios
6	data_files = [	6	data_files = [
7	- ('share/man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),	7	- ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]),
8	- ('share/man/man7', ['doc/man/salt.7'])	8	- ("share/man/man7", ["doc/man/salt.7"]),
9	+ ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),	9	+ ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
10	+ ('man/man7', ['doc/man/salt.7'])	10	+ ('man/man7', ['doc/man/salt.7'])
11	]	11	]
12	if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:	12	if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
13	data_files[0][1].append('doc/man/salt-ssh.1')	13	data_files[0][1].append("doc/man/salt-ssh.1")