aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2017-02-21 17:11:58 -0800
committerChris Craik <ccraik@google.com>2017-02-22 09:16:16 -0800
commit4da9498423988e795cee12789baf39f3f80fd4d3 (patch)
tree06472d7541721210097b8ef05b7bf342beba97c7
parent0261a8b2beb21733fe958366e6f98cd0bde98a35 (diff)
downloadchromium-trace-4da9498423988e795cee12789baf39f3f80fd4d3.tar.gz
Do not check in upstream OWNERS files DO NOT MERGE
Bug: 33166666 Bug: 35635929 Test: update.py --local=catapult-local Change-Id: I4f16655a2a634b0526417fdaaba6641d9564332f
-rw-r--r--catapult/common/OWNERS5
-rw-r--r--catapult/common/battor/OWNERS2
-rw-r--r--catapult/common/eslint/OWNERS2
-rw-r--r--catapult/dependency_manager/OWNERS1
-rw-r--r--catapult/dependency_manager/dependency_manager/OWNERS1
-rw-r--r--catapult/devil/OWNERS4
-rw-r--r--catapult/devil/devil/OWNERS4
-rw-r--r--catapult/systrace/bin/OWNERS6
-rw-r--r--catapult/systrace/profile_chrome/OWNERS2
-rw-r--r--catapult/systrace/systrace/OWNERS1
-rwxr-xr-xupdate.py4
11 files changed, 3 insertions, 29 deletions
diff --git a/catapult/common/OWNERS b/catapult/common/OWNERS
deleted file mode 100644
index 67204793..00000000
--- a/catapult/common/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-dtu@chromium.org
-eakuefner@chromium.org
-fmeawad@chromium.org
-simonhatch@chromium.org
-sullivan@chromium.org
diff --git a/catapult/common/battor/OWNERS b/catapult/common/battor/OWNERS
deleted file mode 100644
index 76381185..00000000
--- a/catapult/common/battor/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-charliea@chromium.org
-rnephew@chromium.org
diff --git a/catapult/common/eslint/OWNERS b/catapult/common/eslint/OWNERS
deleted file mode 100644
index 137ed401..00000000
--- a/catapult/common/eslint/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-charliea@chromium.org
-eakuefner@chromium.org \ No newline at end of file
diff --git a/catapult/dependency_manager/OWNERS b/catapult/dependency_manager/OWNERS
deleted file mode 100644
index ca5ce3b9..00000000
--- a/catapult/dependency_manager/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-aiolos@chromium.org
diff --git a/catapult/dependency_manager/dependency_manager/OWNERS b/catapult/dependency_manager/dependency_manager/OWNERS
deleted file mode 100644
index ca5ce3b9..00000000
--- a/catapult/dependency_manager/dependency_manager/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-aiolos@chromium.org
diff --git a/catapult/devil/OWNERS b/catapult/devil/OWNERS
deleted file mode 100644
index fd584fcd..00000000
--- a/catapult/devil/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-jbudorick@chromium.org
-mikecase@chromium.org
-perezju@chromium.org
-rnephew@chromium.org
diff --git a/catapult/devil/devil/OWNERS b/catapult/devil/devil/OWNERS
deleted file mode 100644
index fd584fcd..00000000
--- a/catapult/devil/devil/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-jbudorick@chromium.org
-mikecase@chromium.org
-perezju@chromium.org
-rnephew@chromium.org
diff --git a/catapult/systrace/bin/OWNERS b/catapult/systrace/bin/OWNERS
deleted file mode 100644
index 374072a7..00000000
--- a/catapult/systrace/bin/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-per-file adb_profile_chrome=file://systrace/profile_chrome/OWNERS
-per-file adb_profile_chrome_startup=file://systrace/profile_chrome/OWNERS
-
-per-file systrace=file://systrace/systrace/OWNERS
-
-ccraik@google.com
diff --git a/catapult/systrace/profile_chrome/OWNERS b/catapult/systrace/profile_chrome/OWNERS
deleted file mode 100644
index 51a6670d..00000000
--- a/catapult/systrace/profile_chrome/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-skyostil@chromium.org
-zhenw@chromium.org
diff --git a/catapult/systrace/systrace/OWNERS b/catapult/systrace/systrace/OWNERS
deleted file mode 100644
index a007f0a3..00000000
--- a/catapult/systrace/systrace/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-ccraik@google.com
diff --git a/update.py b/update.py
index 9e53f9e6..d4a4dd52 100755
--- a/update.py
+++ b/update.py
@@ -4,6 +4,7 @@ import codecs, httplib, json, optparse, os, urllib, shutil, subprocess, sys
upstream_git = 'https://github.com/catapult-project/catapult.git'
PACKAGE_DIRS = ['common', 'dependency_manager', 'devil', 'systrace']
+IGNORE_PATTERNS = ['OWNERS'] # doesn't make sense to sync owners files
script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
catapult_src_dir = os.path.join(script_dir, 'catapult-upstream')
@@ -60,4 +61,5 @@ update_systrace_trace_viewer.update(no_auto_update=True, no_min=options.no_min)
shutil.rmtree(catapult_dst_dir)
for d in PACKAGE_DIRS:
shutil.copytree(os.path.join(catapult_src_dir, d),
- os.path.join(catapult_dst_dir, d))
+ os.path.join(catapult_dst_dir, d),
+ ignore=shutil.ignore_patterns(*IGNORE_PATTERNS))