commit a4565d0102690702569fa889a162f5003d607939
author Dexter Rivera <riverade@google.com> Mon Apr 12 13:44:16 2021 -0700
committer Dexter Rivera <riverade@google.com> Mon Apr 12 21:21:29 2021 +0000
tree cfa9199f5215ecd09bb0216dcee69d4014c577fc
parent bbc949c0d9e61154724bce2f76522c04a8c91da1

Fix path to portage-stable repo

BUG=None
TEST=Ran repo upload on a change in portage stable without the -r1
symlink

Change-Id: I275e2e47e4d5c674545f6c0fa75351e1954c1bc1
Reviewed-on: https://cos-review.googlesource.com/c/cos/repohooks/+/15491
Reviewed-by: Leah Rumancik <lrumancik@google.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Tested-by: Dexter Rivera <riverade@google.com>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 11a9b44..e605588 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -985,7 +985,7 @@
   # that we're doing anything other than importing files from upstream, so
   # forcing a rev bump makes no sense.
   whitelist = (
-      'cos/overlays/portage-stable',
+      'third_party/overlays/portage-stable',
   )
   if project.name in whitelist:
     return None
@@ -1091,7 +1091,7 @@
   # that we're doing anything other than importing files from upstream, and
   # we shouldn't be rewriting things fundamentally anyways.
   whitelist = (
-      'cos/overlays/portage-stable',
+      'third_party/overlays/portage-stable',
   )
   if project.name in whitelist:
     return None
@@ -1236,7 +1236,7 @@
   # If this is the portage-stable overlay, then ignore the check.
   # We want to import virtuals as-is from upstream Gentoo.
   whitelist = (
-      'cos/overlays/portage-stable',
+      'third_party/overlays/portage-stable',
   )
   if project.name in whitelist:
     return None

pre-upload_unittest.py

diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index 0a10fa4..342eecf 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -519,7 +519,7 @@
 class CheckEbuildEapi(PreUploadTestCase):
   """Tests for _check_ebuild_eapi."""
 
-  PORTAGE_STABLE = ProjectNamed('cos/overlays/portage-stable')
+  PORTAGE_STABLE = ProjectNamed('third_party/overlays/portage-stable')
 
   def setUp(self):
     self.file_mock = self.PatchObject(pre_upload, '_get_affected_files')
@@ -1985,7 +1985,7 @@
   def testWhitelistOverlay(self):
     """Skip checks on whitelisted overlays."""
     self.assertAccepted([DiffEntry(src_file='cat/pkg/pkg-0.ebuild')],
-                        project='cos/overlays/portage-stable')
+                        project='third_party/overlays/portage-stable')
 
   def testWhitelistFiles(self):
     """Skip checks on whitelisted files."""