Bladeren bron

repo: Update from upstream

  - 0214730c9afaf732b3571f3f63416fea9f98a65c launcher: switch command quoting to shlex.quote by Mike Frysinger <vapier@google.com>

GitOrigin-RevId: 0214730c9afaf732b3571f3f63416fea9f98a65c
Change-Id: I38b5d6a05df9f5213d83a60dab863d2db791d5f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6448569
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Copybara Service <copybara-worker-blackhole@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Android Open Source Project 4 maanden geleden
bovenliggende
commit
65c59753a8
1 gewijzigde bestanden met toevoegingen van 8 en 3 verwijderingen
  1. 8 3
      repo_launcher

+ 8 - 3
repo_launcher

@@ -57,9 +57,14 @@ class Trace:
 trace = Trace()
 
 
+def cmdstr(cmd):
+    """Get a nicely quoted shell command."""
+    return " ".join(shlex.quote(x) for x in cmd)
+
+
 def exec_command(cmd):
     """Execute |cmd| or return None on failure."""
-    trace.print(":", " ".join(cmd))
+    trace.print(":", cmdstr(cmd))
     try:
         if platform.system() == "Windows":
             ret = subprocess.call(cmd)
@@ -506,7 +511,7 @@ def run_command(cmd, **kwargs):
     # Run & package the results.
     proc = subprocess.Popen(cmd, **kwargs)
     (stdout, stderr) = proc.communicate(input=cmd_input)
-    dbg = ": " + " ".join(cmd)
+    dbg = ": " + cmdstr(cmd)
     if cmd_input is not None:
         dbg += " 0<|"
     if stdout == subprocess.PIPE:
@@ -843,7 +848,7 @@ def _GetRepoConfig(name):
         return None
     else:
         print(
-            f"repo: error: git {' '.join(cmd)} failed:\n{ret.stderr}",
+            f"repo: error: git {cmdstr(cmd)} failed:\n{ret.stderr}",
             file=sys.stderr,
         )
         # This will raise subprocess.CalledProcessError for us.