[Docker] Correctly append ./ prefix to dotted files in archives

Previously, dotted files were though of having the './' prefix.

--
MOS_MIGRATED_REVID=103864015

2 files changed, 20 insertions, 2 deletions

diff --git a/tools/build_defs/docker/archive.py b/tools/build_defs/docker/archive.py
index a8234e136f..5e7eaf33cf 100644
--- a/tools/build_defs/docker/archive.py
+++ b/tools/build_defs/docker/archive.py
@@ -128,7 +128,7 @@ class TarFileWriter(object):
       TarFileWriter.Error: when the recursion depth has exceeded the
                            `depth` argument.
     """
-    if not name.startswith('.') and not name.startswith('/'):
+    if not (name == '.' or name.startswith('/') or name.startswith('./')):
       name = './' + name
     if os.path.isdir(path):
       # Remove trailing '/' (index -1 => last character)
@@ -183,7 +183,7 @@ class TarFileWriter(object):
       # Recurse into directory
       self.add_dir(name, file_content, uid, gid, uname, gname, mtime, mode)
       return
-    if not name.startswith('.') and not name.startswith('/'):
+    if not (name == '.' or name.startswith('/') or name.startswith('./')):
       name = './' + name
     tarinfo = tarfile.TarInfo(name)
     tarinfo.mtime = mtime
diff --git a/tools/build_defs/docker/archive_test.py b/tools/build_defs/docker/archive_test.py
index 7f0a254322..620f7fda1b 100644
--- a/tools/build_defs/docker/archive_test.py
+++ b/tools/build_defs/docker/archive_test.py
@@ -153,6 +153,24 @@ class TarFileWriterTest(unittest.TestCase):
     self.assertSimpleFileContent(["./a", "./ab"])
     self.assertSimpleFileContent(["./a", "./b", "./ab"])
 
+  def testDottedFiles(self):
+    with archive.TarFileWriter(self.tempfile) as f:
+      f.add_file("a")
+      f.add_file("/b")
+      f.add_file("./c")
+      f.add_file("./.d")
+      f.add_file("..e")
+      f.add_file(".f")
+    content = [
+        {"name": "./a"},
+        {"name": "/b"},
+        {"name": "./c"},
+        {"name": "./.d"},
+        {"name": "./..e"},
+        {"name": "./.f"}
+        ]
+    self.assertTarFileContent(self.tempfile, content)
+
   def testAddDir(self):
     # For some strange reason, ending slash is stripped by the test
     content = [