Commit 773e09ea3787cefe9415b133a00da0eabb682ea8 - python-faraday

Refresh patches Sophie Brun 5 years ago

2 changed file(s) with 7 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-1

debian/patches/copy-images-directory.patch less more

5	5	This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
6	6	--- a/faraday.py
7	7	+++ b/faraday.py
8		@@ -333,6 +333,10 @@ def setupXMLConfig():
	8	@@ -331,6 +331,10 @@ def setupXMLConfig():
9	9	if not os.path.isfile(FARADAY_USER_CONFIG_XML):
10	10	logger.info("Copying default configuration from project.")
11	11	shutil.copy(FARADAY_BASE_CONFIG_XML, FARADAY_USER_CONFIG_XML)

-6

debian/patches/remove-unwanted-checks.diff less more

7	7	This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8	8	--- a/faraday-server.py
9	9	+++ b/faraday-server.py
10		@@ -18,7 +18,7 @@ try:
11		from server.models import db, Workspace, User
	10	@@ -17,7 +17,7 @@ try:
	11	from server.models import db, Workspace
12	12	from server.utils import daemonize
13	13	from server.web import app
14	14	- from utils import dependencies

16	16	from utils.user_input import query_yes_no
17	17	from faraday import FARADAY_BASE
18	18	except ImportError as ex:
19		@@ -33,31 +33,31 @@ def setup_environment(check_deps=False):
	19	@@ -32,31 +32,31 @@ def setup_environment(check_deps=False):
20	20	# Configuration files generation
21	21	server.config.copy_default_config_to_local()
22	22

68	68	# Web configuration file generation
69	69	server.config.gen_web_config()
70	70
71		@@ -111,7 +111,7 @@ def main():
72		parser.add_argument('--debug', action='store_true', help='run Faraday Server in debug mode')
	71	@@ -132,7 +132,7 @@ def main():
73	72	parser.add_argument('--start', action='store_true', help='run Faraday Server in background')
74	73	parser.add_argument('--stop', action='store_true', help='stop Faraday Server')
	74	parser.add_argument('--restart', action='store_true', help='Restart Faraday Server')
75	75	- parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
76	76	+# parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
77	77	parser.add_argument('--no-setup', action='store_true', help=argparse.SUPPRESS)
78	78	parser.add_argument('--port', help='Overides server.ini port configuration')
79	79	parser.add_argument('--websocket_port', help='Overides server.ini websocket port configuration')
80		@@ -157,7 +157,7 @@ def main():
	80	@@ -185,7 +185,7 @@ def main():
81	81	server.config.ssl.enabled = 'true'
82	82
83	83	if not args.no_setup: