scripting: modified all paths to use underscores
For consistency, we want to maintain an enum that can be used to specify
linux repositories and database tables.
BUG=None
TEST=None
Change-Id: I9456dc44025afd461fd43423fec41acccd154742
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2084015
Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Commit-Queue: Hirthanan Subenderan <hirthanan@google.com>
Tested-by: Hirthanan Subenderan <hirthanan@google.com>
diff --git a/contrib/findmissing/.gitignore b/contrib/findmissing/.gitignore
index 2c1f271..b9d483b 100644
--- a/contrib/findmissing/.gitignore
+++ b/contrib/findmissing/.gitignore
@@ -1,6 +1,6 @@
-linux-stable
-linux-upstream
-linux-chrome
+linux_stable
+linux_upstream
+linux_chrome
database
secrets/
diff --git a/contrib/findmissing/common.py b/contrib/findmissing/common.py
index dc17dff..873526d 100755
--- a/contrib/findmissing/common.py
+++ b/contrib/findmissing/common.py
@@ -23,9 +23,9 @@
SUPPORTED_KERNELS = ('4.4', '4.14', '4.19', '5.4')
-CHROMEOS_PATH = 'linux-chrome'
-STABLE_PATH = 'linux-stable'
-UPSTREAM_PATH = 'linux-upstream'
+CHROMEOS_PATH = 'linux_chrome'
+STABLE_PATH = 'linux_stable'
+UPSTREAM_PATH = 'linux_upstream'
WORKDIR = os.getcwd()
DBDIR = os.path.join(WORKDIR, 'database')
diff --git a/contrib/findmissing/main.py b/contrib/findmissing/main.py
index 77dbc69..4f5e71d 100755
--- a/contrib/findmissing/main.py
+++ b/contrib/findmissing/main.py
@@ -42,7 +42,7 @@
@app.route('/sync/linux-cloudsource', methods=['POST'])
def post_sync_linux():
- """Syncs linux-upstream, linux-stable, and linux-chromeos.
+ """Syncs linux_upstream, linux_stable, and linux_chromeos.
These repositories are mirrored on cloudsource to avoid fully
cloning the repositories every time we need to parse logs.
diff --git a/contrib/findmissing/scripts/gce/sync_remote_to_gce.sh b/contrib/findmissing/scripts/gce/sync_remote_to_gce.sh
index ca39db2..edefa31 100755
--- a/contrib/findmissing/scripts/gce/sync_remote_to_gce.sh
+++ b/contrib/findmissing/scripts/gce/sync_remote_to_gce.sh
@@ -12,7 +12,7 @@
git -C /opt/dev-util pull
# Replaces last running webserver code with latest pulled changes
-# Note that we are not deleting the large linux git repositories (linux-*)
+# Note that we are not deleting the large linux git repositories (linux_*)
rsync -O -avu \
- --exclude=linux-upstream --exclude=linux-stable --exclude=linux-chrome --delete \
+ --exclude=linux_upstream --exclude=linux_stable --exclude=linux_chrome --delete \
"/opt/dev-util/contrib/findmissing/" "/home/chromeos_patches"
diff --git a/contrib/findmissing/scripts/local/clean_generated_files.sh b/contrib/findmissing/scripts/local/clean_generated_files.sh
index 68390ba..0f2ab76 100755
--- a/contrib/findmissing/scripts/local/clean_generated_files.sh
+++ b/contrib/findmissing/scripts/local/clean_generated_files.sh
@@ -4,5 +4,5 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-rm -rf ../database/ ../__pycache__/ ../linux-upstream/ \
- ../linux-stable/ ../linux-chrome/ ../env/
+rm -rf ../database/ ../__pycache__/ ../linux_upstream/ \
+ ../linux_stable/ ../linux_chrome/ ../env/
diff --git a/contrib/findmissing/scripts/local/sync_local_to_gce.sh b/contrib/findmissing/scripts/local/sync_local_to_gce.sh
index b06021f..0c943c7 100755
--- a/contrib/findmissing/scripts/local/sync_local_to_gce.sh
+++ b/contrib/findmissing/scripts/local/sync_local_to_gce.sh
@@ -25,6 +25,6 @@
USER="$(whoami)"
-rsync -O -rltvz --exclude=linux-upstream --exclude=linux-stable \
- --exclude=linux-chrome --delete \
+rsync -O -rltvz --exclude=linux_upstream --exclude=linux_stable \
+ --exclude=linux_chrome --delete \
"${FINDMISSING_DIR}" "${USER}"@"${GCE_EXTERNAL_IP}":/home/chromeos_patches
diff --git a/contrib/findmissing/synchronize.py b/contrib/findmissing/synchronize.py
index d05907e..28c7c4d 100755
--- a/contrib/findmissing/synchronize.py
+++ b/contrib/findmissing/synchronize.py
@@ -51,7 +51,7 @@
destdir = os.path.join(cwd, path)
upstream_destdir = os.path.join(cwd, UPSTREAM_PATH)
- get_branch = stable_branch if path == 'linux-stable' else chromeos_branch
+ get_branch = stable_branch if path == 'linux_stable' else chromeos_branch
if not os.path.exists(destdir):
print(f'Cloning {repo} into {destdir}')
@@ -107,7 +107,7 @@
def synchronize_repositories():
- """Deep clones linux-upstream, linux-stable, and linux-chromeos repositories"""
+ """Deep clones linux_upstream, linux_stable, and linux_chromeos repositories"""
synchronize_upstream()
synchronize_custom(STABLE_PATH, STABLE_REPO)
synchronize_custom(CHROMEOS_PATH, CHROMEOS_REPO)
