summaryrefslogtreecommitdiffstats
path: root/tools/scripts/patch_upstream.py
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-07-02 11:34:47 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-07-03 13:14:44 +0200
commitd8245424b814591a4fbc4115c1fabe0a34479bb3 (patch)
treeeec90dda1799b2631f0d99f2c51a2b974c89ac38 /tools/scripts/patch_upstream.py
parent5317069f3d0d27ed6192a41b3f7b7e6b74dfbbed (diff)
tools: add reset option to patch_upstream.py
This patch makes it possible to reset the upstream chromium repository to its baseline state. Change-Id: Idff94a0f873e994716f77c83f4c5b79bcd48aec5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tools/scripts/patch_upstream.py')
-rwxr-xr-xtools/scripts/patch_upstream.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/scripts/patch_upstream.py b/tools/scripts/patch_upstream.py
index 081a2452..d15dcf5c 100755
--- a/tools/scripts/patch_upstream.py
+++ b/tools/scripts/patch_upstream.py
@@ -55,6 +55,12 @@ import version_resolver as resolver
os.chdir(os.path.join(resolver.upstream_src_dir, 'chromium'))
+if len(sys.argv) != 1:
+ if "--reset" in sys.argv:
+ resolver.resetUpstream()
+ sys.exit()
+ else:
+ sys.exit('unknown option, try --reset or w/o options\n')
if not len(resolver.findSnapshotBaselineSha1()):
sys.exit('\n-- missing chromium snapshot patches, try running init-repository.py w/o options first --')