diff options
| -rw-r--r-- | localserver/applicator.py | 2 | ||||
| -rw-r--r-- | localserver/reapply.patch4 | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/localserver/applicator.py b/localserver/applicator.py index ea9b5f7..aa84ce3 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 --exclude=doc/ --reject "+line.replace("\n", "")+".diff", shell=True) + subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --exclude=doc/ --exclude=tools/ --exclude=db/ --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)" diff --git a/localserver/reapply.patch4 b/localserver/reapply.patch4 index 6bb01b2..bbf4098 100644 --- a/localserver/reapply.patch4 +++ b/localserver/reapply.patch4 @@ -1,6 +1,6 @@ ############ # HOWTO: -# git diff v2019.07.28.. --pretty=short +# git log v2019.07.28.. --pretty=short ############ ## v2019.07.28 @@ -32,6 +32,10 @@ f4b5f645cac0e50c7dc3079d9a388eed0b62ad9b ############ ## v2019.08.25 -## +## Convert sc_config to use libconfig +7c88915931bd0ff80bba2db07848519cce92d514 +6ea8e59e52e8046c5ea8d3a42f3a67d06564e1f7 + + |