commit 0e8da0a099dce1530682b533a57007d8063558a0
author Mike Frysinger <vapier@chromium.org> Mon Aug 31 12:47:36 2020 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Sep 04 08:10:21 2020 +0000
tree e5b3a511d73ef4b577b4435374d45210e4f97dfe
parent ea896e4dfa3765ed6b6cf2b3514350297b2635ec

gs: rm: add -- before path

This shouldn't normally be an issue, but we're defensive in other
gs subcommands, so should be defensive here too.

BUG=None
TEST=CQ passes

Change-Id: I7f07b453534581cff5759742073e0f66aca4d13f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2386035
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

lib/gs.py

diff --git a/lib/gs.py b/lib/gs.py
index 548de2d..c63b4ae 100644
--- a/lib/gs.py
+++ b/lib/gs.py
@@ -1176,6 +1176,7 @@
       raise TypeError('"recurse" has been renamed to "recursive"')
     if recursive:
       cmd.append('-R')
+    cmd.append('--')
     cmd.append(path)
     try:
       self.DoCommand(cmd, **kwargs)

lib/gs_unittest.py

diff --git a/lib/gs_unittest.py b/lib/gs_unittest.py
index 73867f4..db323b0 100644
--- a/lib/gs_unittest.py
+++ b/lib/gs_unittest.py
@@ -631,7 +631,7 @@
 
   def testMissing(self):
     """Test behavior w/missing files."""
-    self.gs_mock.AddCmdResult(['rm', 'gs://foo/bar'],
+    self.gs_mock.AddCmdResult(['rm', '--', 'gs://foo/bar'],
                               error='CommandException: No URLs matched: '
                                     'gs://foo/bar',
                               returncode=1)