summaryrefslogtreecommitdiff
path: root/localserver
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-19 21:22:24 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-19 21:22:24 -0300
commit6a17445f00e84df70fff4c23e870e49bdc839106 (patch)
tree0b131842c001a0761b1230a8107ff4651d6be739 /localserver
parent7663691709796dcd349e0ca8c06037a3edc23e69 (diff)
downloadtools-6a17445f00e84df70fff4c23e870e49bdc839106.tar.gz
tools-6a17445f00e84df70fff4c23e870e49bdc839106.tar.bz2
tools-6a17445f00e84df70fff4c23e870e49bdc839106.tar.xz
tools-6a17445f00e84df70fff4c23e870e49bdc839106.zip
We're picking stuff from upstream, so we need to exclude eg. docs update etc.
Diffstat (limited to 'localserver')
-rw-r--r--localserver/applicator.py2
1 files changed, 1 insertions, 1 deletions
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)"