Codebase list python-faraday / debian/2.5.0-0kali1
Update patches Sophie Brun 6 years ago
2 changed file(s) with 13 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all
+3
-3
debian/patches/fix-checkVersion.patch less more
00 --- a/faraday.py
11 +++ b/faraday.py
2 @@ -487,7 +487,7 @@ def checkVersion():
2 @@ -493,7 +493,7 @@ def checkVersion():
33 f_version = f.read().strip()
44 if not args.update:
55 if getInstanceConfiguration().getVersion() is not None and getInstanceConfiguration().getVersion() != f_version:
66 - logger.warning("You have different version of Faraday since your last run.\nRun ./faraday.py --update to update configuration!")
7 + logger.warning("You have different version of Faraday since your last run.\nRun python-faraday.py --update to update configuration!")
7 + logger.warning("You have different version of Faraday since your last run.\nStart python-faraday.service (systemctl start python-faraday) and run /usr/share/python-faraday/faraday.py --update to update configuration!")
88 if query_yes_no('Do you want to close Faraday?', 'yes'):
99 sys.exit(-1)
1010
11 @@ -542,7 +542,7 @@ def main():
11 @@ -541,7 +541,7 @@ def main():
1212 checkConfiguration(args.gui)
1313 setConf()
1414 checkCouchUrl()
+10
-8
debian/patches/remove-unwanted-checks.diff less more
7272 - parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
7373 +# parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
7474 parser.add_argument('--no-setup', action='store_true', help=argparse.SUPPRESS)
75 args = parser.parse_args()
76
77 @@ -110,7 +110,7 @@ def main():
75
76 f = open(server.config.VERSION_FILE)
77 @@ -117,7 +117,7 @@ def main():
7878 server.config.ssl.set('enabled', 'true')
7979
8080 if not args.no_setup:
145145
146146 parser.add_argument('--update',
147147 action="store_true",
148 @@ -171,37 +171,37 @@ def getParserArgs():
148 @@ -171,7 +171,7 @@ def getParserArgs():
149149 default=False,
150150 help="Enables debug mode. Default = disabled")
151151
152152 - parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
153153 +# parser.add_argument('--nodeps', action='store_true', help='Skip dependency check')
154154
155 # args = parser.parse_args(['@parser_args.cfg'])
155 f = open(FARADAY_VERSION_FILE)
156 f_version = f.read().strip()
157 @@ -183,31 +183,31 @@ def getParserArgs():
156158 return parser.parse_args()
157159
158160
209211
210212
211213 def startProfiler(app, output, depth):
212 @@ -439,26 +439,26 @@ def update():
214 @@ -445,26 +445,26 @@ def update():
213215 logger.info("Faraday will start now.")
214216
215217
256258
257259
258260 def checkCouchUrl():
259 @@ -529,8 +529,8 @@ def main():
261 @@ -528,8 +528,8 @@ def main():
260262 setupFolders(CONST_FARADAY_FOLDER_LIST)
261263 setUpLogger(args.debug)
262264
267269
268270 printBanner()
269271 if args.cert_path:
270 @@ -538,12 +538,12 @@ def main():
272 @@ -537,12 +537,12 @@ def main():
271273 checkConfiguration(args.gui)
272274 setConf()
273275 checkCouchUrl()