Unified Diff: adblockplus/build.py
Issue 30033563:
Issue 7415 - ABP data is not being migrated
Patch Set:
Created March 28, 2019, 2:01 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
adblockplus/issue-7415.patch » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: adblockplus/build.py |
| =================================================================== |
| --- a/adblockplus/build.py |
| +++ b/adblockplus/build.py |
| @@ -49,16 +49,19 @@ |
| abp_dir = os.path.join(patched_dir, _ABP_DIR) |
| abp_core_dir = os.path.join(abp_dir, _ABP_CORE_DIR) |
| subprocess.check_call(["hg", "import", "-q", "-R", abp_core_dir, |
| os.path.join(patched_dir, "issue-6070.patch")]) |
| subprocess.check_call(["hg", "import", "-q", "-R", abp_core_dir, |
| os.path.join(patched_dir, "issue-6108.patch")]) |
| + subprocess.check_call(["hg", "import", "-q", "-R", abp_dir, |
| + os.path.join(patched_dir, "issue-7415.patch")]) |
| + |
| if __name__ == "__main__": |
| if len(sys.argv) < 2: |
| error_message = "Usage: %s XPI_PATH" % os.path.basename(sys.argv[0]) |
| print >>sys.stderr, error_message |
| sys.exit(1) |
| xpi_path = sys.argv[1] |
| patched_dir = tempfile.NamedTemporaryFile().name |
« no previous file with comments
|
« no previous file
|
adblockplus/issue-7415.patch » ('j')
|
no next file with comments »
