From 6a17445f00e84df70fff4c23e870e49bdc839106 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 19 May 2020 21:22:24 -0300 Subject: We're picking stuff from upstream, so we need to exclude eg. docs update etc. --- localserver/applicator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localserver/applicator.py b/localserver/applicator.py index 571d10f..ea9b5f7 100644 --- a/localserver/applicator.py +++ b/localserver/applicator.py @@ -33,7 +33,7 @@ for line in f: subprocess.call("cd ../../server-code ; wget https://github.com/HerculesWS/Hercules/commit/"+line.replace("\n", "")+".diff", shell=True) print "Applying patch..." #subprocess.call("cd ../../server-code ; ls", shell=True) - subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --reject "+line.replace("\n", "")+".diff", shell=True) + subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --exclude=doc/ --reject "+line.replace("\n", "")+".diff", shell=True) print "Patch applied" subprocess.call("cd ../../server-code ; rm "+line.replace("\n", "")+".diff", shell=True) print "Patch deleted (success)" -- cgit v1.2.3-70-g09d2