commit 62de9a54c37a342c2d0442c2d5d28b819d7e5710
author Mike Frysinger <vapier@chromium.org> Mon Mar 15 16:51:59 2021 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Mar 16 18:46:42 2021 +0000
tree a6f32ff779fbaef631df56badecb69fd701ce41e
parent d93177cb824290cc917dd4309319995bdd34cf3a

cros_portage_upgrade: stop deleting our OWNERS & README.md files

We maintain these files ourselves, so don't delete them when upgrading.

BUG=None
TEST=`cros_portage_upgrade --host --upgrade dev-vcs/repo` doesn't delete dev-vcs/repo/OWNERS

Change-Id: I3cafdb245e15ebe4d8d7a2b5144780e4d5c14d2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2762899
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Stephane Belmon <sbelmon@google.com>

scripts/cros_portage_upgrade.py

diff --git a/scripts/cros_portage_upgrade.py b/scripts/cros_portage_upgrade.py
index f0bd8dc..04b4a6f 100644
--- a/scripts/cros_portage_upgrade.py
+++ b/scripts/cros_portage_upgrade.py
@@ -41,6 +41,9 @@
 # Arches we care about -- we actively develop/support/ship.
 STANDARD_BOARD_ARCHS = set(('amd64', 'arm'))
 
+# Files that we authored.
+CROS_AUTHORED_FILES = {'OWNERS', 'README.md'}
+
 
 # pylint: disable=attribute-defined-outside-init
 
@@ -716,12 +719,12 @@
       raise RuntimeError('Cannot find upstream ebuild at "%s"' %
                          upstream_ebuild_path)
 
-    # If pkgdir already exists, remove everything in it except Manifest.
+    # If pkgdir already exists, remove everything except files we maintain.
     # Note that git will remove a parent directory when it removes
     # the last item in the directory.
     if os.path.exists(pkgdir):
-      items = os.listdir(pkgdir)
-      items = [os.path.join(catpkgsubdir, i) for i in items]
+      items = set(os.listdir(pkgdir)) - CROS_AUTHORED_FILES
+      items = [os.path.join(catpkgsubdir, x) for x in items]
       if items:
         args = ['rm', '-rf', '--ignore-unmatch'] + items
         self._RunGit(self._stable_repo, args, stdout=True)